From 92b253904062edd533e55c22824de6fd01e2f7c1 Mon Sep 17 00:00:00 2001 From: Matthew Somerville Date: Mon, 29 Apr 2019 19:06:01 +0100 Subject: [PATCH] Version 2.6. Include the usual generate new .pot file, gettext-merge, push to Transifex, pull from Transifex step. --- .tx/config | 2 +- CHANGELOG.md | 2 + README.md | 2 +- bin/install-as-user | 2 +- bin/site-specific-install.sh | 2 +- docs/_includes/admin-tasks-content.md | 13 +- docs/_posts/2019-04-29-v2.6.md | 37 + docs/assets/posts/v2.6-image.jpeg | Bin 0 -> 210784 bytes locale/FixMyStreet.po | 995 ++++++------ locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po | 1377 +++++++++-------- locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po | 1372 ++++++++-------- locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po | 1374 ++++++++-------- locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po | 1372 ++++++++-------- locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po | 1372 ++++++++-------- locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po | 1372 ++++++++-------- locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po | 1375 ++++++++-------- locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po | 1372 ++++++++-------- locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po | 1374 ++++++++-------- locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 1377 +++++++++-------- locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po | 1374 ++++++++-------- locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po | 1372 ++++++++-------- locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po | 1372 ++++++++-------- locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po | 1375 ++++++++-------- locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po | 1372 ++++++++-------- locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po | 1373 ++++++++-------- locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po | 1374 ++++++++-------- locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po | 1377 +++++++++-------- locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po | 1376 ++++++++-------- script/update | 2 +- templates/web/zurich/report/new/notes.html | 2 +- 46 files changed, 25755 insertions(+), 23422 deletions(-) create mode 100644 docs/_posts/2019-04-29-v2.6.md create mode 100644 docs/assets/posts/v2.6-image.jpeg diff --git a/.tx/config b/.tx/config index 1654feb6d07..479687d4327 100644 --- a/.tx/config +++ b/.tx/config @@ -2,7 +2,7 @@ host = https://www.transifex.com type = PO -[fixmystreet.v2-5] +[fixmystreet.v2-6] file_filter = locale/.UTF-8/LC_MESSAGES/FixMyStreet.po source_file = locale/FixMyStreet.po source_lang = en_GB diff --git a/CHANGELOG.md b/CHANGELOG.md index ebcf7c1dc4b..c07db815fbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## Releases * Unreleased + +* v2.6 (3rd May 2019) - New features: - (Optional) auto-suggestion of similar nearby problems, while reporting, to discourage duplicate reports. #2386 diff --git a/README.md b/README.md index 0db31ded461..f01e206cc16 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ RSS alerts of problems in their area. It was created in 2007 by [mySociety](https://www.mysociety.org/) for reporting problems to UK councils and has been copied around the world. The FixMyStreet -Platform is now at version 2.5; see CHANGELOG.md for a version history. +Platform is now at version 2.6; see CHANGELOG.md for a version history. ## Installation diff --git a/bin/install-as-user b/bin/install-as-user index 7e2a0bd7494..ce6facbd117 100755 --- a/bin/install-as-user +++ b/bin/install-as-user @@ -109,5 +109,5 @@ fi # Generate po and mo files (these invocations taken from Kagee's script): echo "Creating locale .mo files" -commonlib/bin/gettext-makemo FixMyStreet +commonlib/bin/gettext-makemo FixMyStreet 2>&1 echo $DONE_MSG diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index e3078ba564a..f0b78302f94 100644 --- a/bin/site-specific-install.sh +++ b/bin/site-specific-install.sh @@ -1,7 +1,7 @@ #!/bin/sh # Set this to the version we want to check out -VERSION=${VERSION_OVERRIDE:-v2.5} +VERSION=${VERSION_OVERRIDE:-v2.6} PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh diff --git a/docs/_includes/admin-tasks-content.md b/docs/_includes/admin-tasks-content.md index abc73da1f95..b62e9f53166 100644 --- a/docs/_includes/admin-tasks-content.md +++ b/docs/_includes/admin-tasks-content.md @@ -35,11 +35,14 @@ members will see reports within these categories by default. Permissions required: none -If required, you can also use the controls to the right of the screen to zoom in or out, or pan across -the map. As you’ll see, the list of reports always reflects the area you are viewing on the map, so -this is another way of refining your view. - -Once you've found a satisfactory view, and if you are likely to want to revisit it, click on the 'Permalink' button at the bottom of the screen. This will alter the URL displayed in your browser, and allow you it as a bookmark which you may revisit, so you don't have to define the location again in the future. +If required, you can also use the controls to the right of the screen to zoom +in or out, or pan across the map. As you’ll see, the list of reports and URL +(web address) always reflect the area you are viewing on the map, so this is +another way of refining your view. + +Once you've found a satisfactory view, and if you are likely to want to revisit +it, you can bookmark or otherwise take a copy of the URL displayed in your +browser, so you don't have to define the location again in the future. diff --git a/docs/_posts/2019-04-29-v2.6.md b/docs/_posts/2019-04-29-v2.6.md new file mode 100644 index 00000000000..6e74b87f566 --- /dev/null +++ b/docs/_posts/2019-04-29-v2.6.md @@ -0,0 +1,37 @@ +--- +layout: post +title: Version 2.6 +author: matthew +--- + +
+ +Image © Ben Waddington +
+ +Today we have released **version 2.6** of FixMyStreet. + +This release fixes a cross-site scripting security issue where someone could +create a report through the site with a specially constructed query parameter, +and then viewing that report on the admin report edit page would allow the +report creator to run their own JavaScript. We have also released version 2.5.1 +which is identical to 2.5 including this fix. + +There's a new, optional, feature to auto-suggest similar nearby problems while +reporting, to discourage duplicate reports; and the map state is now updated in +the URL to make sharing links easier. A bit more work has been done on +moderation, spotting conflicts and showing moderation history to staff on +report pages, as well as in the admin. + +Mostly this release is bugfixes, please see the +[changelog](https://github.com/mysociety/fixmystreet/releases/tag/v2.6) for +full details. + +## Upgrading + +The admin body and user sections have been refactored – if you have custom +templates/code, you may need to update links to those. + +If you wish the default for the showname checkbox to be checked, you can add +`sub default_show_name { 1 }` to your cobrand file. + diff --git a/docs/assets/posts/v2.6-image.jpeg b/docs/assets/posts/v2.6-image.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..478be2698f76ace94dc7d3ff79c7e8cd43e140ad GIT binary patch literal 210784 zcmb4~c%-4}N$?k?+Fa^+Z*2wjYlzyaUK9WU`9Fv8J#0#W6ljK2$Y`@~p)TZ?^kk@s(0 z|8Cdfa(-sQqxT7OA$!nWn|qWBp!;;5qrST1Y=mp;>GrVYiD&0%F_`%>T-Fh%C(xf? zEJb$hckfwst72(>eKYQt;tB~@(yeRoX>hSNA0XC3o4Z#=@K^DQNWgAop|P<0XWTVW zjs4}54=x$GO8_#&l1yz?_{OHL0-}J1F(VNL?p(@AdW|a zaHD*E)efYb_v=0^KSI@EiJf17Q3#(f54E~=h<>8hMca1OPN%^?=O9b4}^8n&tg@64O$S)n)VJkB~b-w>_=*8;*PT)aH;JYPy3 zFk-iROMfpuRL`rO7iFFm)$-6-IT&?Z#n)=vmS+oT`)WGHHI zkwgqBqLHFn>);X5tNi$b`utS_(xhJJd_VMx>NC|6f(0Z+=lptZTX5bhJv%>IMlris z6RzCnKf}lVL>q!$atDu|W1ljWRCE+mBZ)4{{$TJnH=@WM3vgVz=&0*HIY7@y}Q|!@9O2p}TaWU(W!luWE z4aAPj8aoo@1IgYWq?R{YKgM*W6b7h_|I~G@EBqvq)fN8oN9urXv3e?s`vwyk5Obiw z05E{2tN<}c{gSL%(hS%}5iPpO+n|IY5_se&ZVa*3QMHu=PFWp1rPJh>4AUq6OeG^v zH5@40O5ExeWiy64iP(Q7rn=&`kd{(hfE=^IHYIA?iNOq{n@_wpr&(j4g5G8aY9NcxN|a>y8xK>)9yj~OAnQEiH`*bcWHGVPIm~*O(GDIF=Z(S0TRnbr6>i7D$>P;ktY1}TFoa})UYnkK>gJQz zk`-10A9m|ZANT5vAG>TBO0(z~jQ`3h*Edo|RzkR!n`6GHRl7jox5B-ew(5sT;{?yfpQHRQvPa=lqsiCJv{VYYJLz#d&xsr&W z@GNhuz8`7TklqWPY9wT!_aG_^cp1 zyhs;hiWux$CHgpgcIOgL19vM)95Sfb{seT|L2IoI61<2;%h-&B&&t>3#ZH5h#MVCc z)}0*U z3Q8m(b7Pw7?HN?l!P4XbXcMMHt|eY5SryJ)%w;A9(Nj2d5Dqp|Vy1ekG)ID{y8?^^ zY~^KSzmSk%Hu0eyC{R?+{2beS3^tVYWZ%5d`{8A0zi?fCB6u;ka{A)ytJDCvr+zT%$NhzjG8^9=KtTwO2 zM$I)X4<{(r$*t)s^Bg3KIGf}{jL-5 zVDc!Bom6-$;JkFx=E*`~6M^kT@?k+i>w%p~rA2!<11 z5;t7@LS$aCE>Q>fF(M-_Zrd7@vTngcJ2+`z=|&^jXfWwmJB#Nm4GaGgDQ;6M1&x%a zW`^mh$()-OJj)XiG>L6$>MenPygD=;p9ZBM1V$R*vrO}a%AcvKufbP$N7VP=cntmq zDPY4~z3e^M>W+Ta>Y8V@4yr?~lLUMuMJJkl@yKqi$(uyL{qlR~8|LXhc!wwenWqtmNYWP*9s)CV@Ay zf~&1qhC;fkau%|)I#(}_3Rxrqf4|z!n)mdi(~N+DJ6OON$ssyHdze^4*f|lC$xn`n zWG>IJg&|6C&bBX*a?UI(euhFfxXZ@_?u&N6UprZN{z=vgq1bIGRK^TQ%BGU)&$;8Z z_=j@OskQX_rXCycSs${Zjt1aQ(h#JWwo#-_s-0K85$^d)BJM`mM7`A4nRVACOrCYS zl;ImUN+43F%ji3e4&(V=AK8MrJzYiLmKe!L**tSkZ#@ngf0vc4o1GpoE) z-PF|azsGjrHk-*?ZV{@3P1-VS`D~qhk#9Y@dJg8Qc`HIMUpS8xHI9{EzLl1pz6`Eg zp_Zl&492qha{oXow1b?oAsRKc@;BPdZ%#Vc;S?S2d~&ihR?`f?%BS4$bA1#_b1}zY zCoYQGqCYTb!@&<>3q1qXtWR>s4c>KB(tvO7v5Wu z^>$Dt?4?Q>z(Tb^$J{R83tFenmD>HY+nY;U;?~5c)Vs%>)lL?ZF<33j0@J|b0Wq8Q z4HXw-Og$0zR-gkEt7<_~v|tYv=TLN!!nYiz9Nbp4UyR6Uc?8zHYgP5)J$^*5wtW?~ z;`W(_6y<_qU`!s;TCG9Xe&*B1{2`F!0`H+31C_povF1py)%^GJ(@?yqc~$Jui`xfd zsm55@CJ#zC?aWOGy0P;5VVs%%#T^mxXl=xjL-+c;gz4e%i9f%8sZB>R#$%JDz|-nulEW7~uW_J4H2J_kGX7%-BH&KgbB1^2wk^qAH#S1I+um;WU9q(zwvv7;VI8zh)q( zA5Yrmq+VO{!Bbj%=RLP{Yan4Kty6KpWaIN`PH$<83W>yCR{kO%Z>rw?!dSw}{hCLm z1^H?4Uum~W11}AY8M*>qH` zd#y7~r1{i~J)_PJXWt8T9w5Gc7P5R>wJf!}jRt{sD;LR+e)1IbV40XJ7okQ}cp`|- zWo^Vilk@t;zakfQU*|(}lVWsj{tFN5DXI9lcZQB@GEeDG>qvlYCHKntRh8pbMrVEH z8L`N;ngjux1v{7^>pKy$FgOU8-nq!kWBHy^p!w(OJfuRk+)>^PPx;=d|HH*&iol&@ z$laI0Z+$^mJ&C2E?;N>ntIuFlqO8CFLs&X#t6dE7Rk8j2@oXY~&k+-Tw`i;~;CUKb zdfZzqt7!NztFBoeeAuSN9%W|N*v3wQPRl;`=pi{0K#b1UiY~!3z*X7vvi;j_Nm85p zYGJ#QETkzX=ETdLkc&ujSD%kY+QV}pWirM7`}#?l8EgtuO$CQk*%Eqv+JWWPtCD>! z)^0wVzlu_j)8^mlMwweN&?J9a)N}u;sp2DBynHOzc{aF#-D$dLB`FD`+$i2?n0K1^ z;bC6;hi=XkdY5$0t1z93!y8nra4>*83%7|!aNHt+4Va35Gs~?vIHw^?w3YRq5) z3;Sfg%`7MOi{V^7TD#S$^*;cU*(TtPChc=erJu3Yr9lCid)$u}c=@qx z!~NaJJ0f%V%~}WjR$41IPymDZqF!YSQ))O>wW2GUyXTD$RUNs)D2miF6T1Gs_l*CX zK~BGPT_5?9+_@L-$RWHWVBRhHfoZ<-BKu4@C^VK%d;J~&I~7A)a;DjrGT--_G5eCa zGx(u&Kek$UzDx6|8#{B+9H_XS-cj4h$C|$uZ3T>Rm#eHU`dR47FFwhw?#b>&&%ebH zN!y9b8ZKO3)tD_&>w+ioob9UQO{EMFo4GO)1q*kZGr{z;p2W?c{XUiJI*~cJ^MGvk zRO=nSBZ?fmG5cs{DB%i5I+$RA!!efmLQ){inGCT=@Rz7|%!eA45(S_V@QmlbpCoD68|jhkU&AW_?Lu-f z(?3#Fa0<3&b(kUY3m00(WRb*M{_&l555^=TgmJhFm%(UDZap9o+28TE*9k3jg^Toz zJ6>nns5@|5rbe5@O)_q1&6%3t8kTK)PXv~lJv;7aCnB!9D=p^&4ZXN0W5E~SmNUL5L%nS3 z=95b!qRn+B9%^x&_rd|j$~g{lS1v%qsZ7UI>`=p`u8fL!Y##;N$u53-T{PeMRksPV z>>e|rIu=!e-uWFjsgU6H0ing|XkI7!>tx|W@peZkrMO0YQ%dor_XY>=T9}qJ=eI&W zz3u7?>Bg!3`sAto5g7`_k031clV|r5hjqG+1}@{w8+4_`4Rs?XvG*r0pH8TfE8XFiPtvr!pMJfCMjq;OHdXZFX6wcl9)=X<~F z-xKZZ46Gbf^jP?2NOym7Xtp&0Bc80K-6+f;l*4p^dB2alQyKy+6iRf$TXFaF!5#+v z$tCp;fD>_DCx>}ra(WuIj~Ie6*wU`f%{VMlY%x#LhzuZ2QWA?DLjk*=d>CIW2}Cnc zliXXd7s>M1V)D_ei%zR1P`*=z8iJK;mu+wpY{!kre|_yMr~De&{1?(5nucjAex$2P{Q;S8M{`z=h$Ul*J-%BX9NWVpJUk2vE-n5nD^CIk?5 zLGk9;+!%gAoOQQ{@df7uOihD?#W98I8j92T4~Bwk#x&FyTdaurnP`=cwo5j!v8sHb z?152d(=ByoNs@lcYP(tCl?%PczDxm`aP1$Y^-dZ?A(QJp*y0Ki0m2dKjTiQQfdL;8 zVIK&xhO{y5JCSoPgT#Z4CX}09NL3T`$lpDYiX)pA#bM-X2}O)GLouREoF$P8#1tfW z(?!X+fkAa^svN$tHS0y6<-ga=PMCTXE%d%7T)G%JbO_WNx&Ay*M~axe_SxIlPrle+ zkGrHrr^jhi6(Y8uF?kDtY`NxXI%RrQocRj|F@0PE3X%sfAzrOjGIK^#Fd>F}8rPhh z_WIeVOE;C|3dCg0QE((>a?PbV%K3LkWh!Xkr3r)ej!)m-pgT>u;bR3jp8z@I=o1KyO#F@~TM5;*iunJn#W0&DBF zM(3pY682oD7zx=`Rd8d?GG>wct>2N@IpB=BaBt*PaBAXQQwar?`|Of5s;IgQ9aMHq zpVxCSEEBS!jNq%3DD_59^OI{>SZG8kRI?6;ePh(*<6>myp2|RYPL(^Yyw~dZ?)0-Ya31|TACH%uFTC`^gSElq12*(?Y>Pj)FHk}$b?!NhcY>Hsf)Wx zl@+DAHLte_>JovZD5=FXnnHxL3R$W75ly^_+G@j~3Y^14(Hw}1QKfEv$co39%2dLn zW)V<@A2L*I4H1gOjomhz#*@X|%ZA?k-VgRlzholg6pVM&gCz8Ds<%5Cw*}`lNWQok+3*8X2$HcG3z}@E{4)5iOEU_lNnvEVR94E2h7W|^_-tK-lxcEpgt?>uH*ouI^FxsUnBze#`gYOk z_@wEfnD7_59**%08lhB2u4)v_hYG92Jqpr8L#^Iv>!&f0piy$k!`*nFmu9+f&;Ni= z>swU< zBzka++?N~tNs(2Ug`9HL zW&0|9ntBPFNPig0I!CV;@s3of!Of@jBWa|fJgfB(t36U24_3}c0F!h05fPb4Jlupg z=srLS=>Jom`*09MYruYeF@)yB%3@jJt0)f=de<2D-8aRd++ai515b`hoO^EVXQDJK ze0j;*L7$^3s0#Lj%#nNzD1bN@k6fB&k$MuSlb@Kx&;w{5wlIx9Z`9uhS=aRw9b%zr-!b{=Wuv?L8 zUL|bib%I26s{CZ%=+I(G+RjO4rLBdjGy^(9=S{WsFwMn)nXEBlr$)L z{YiQE%pyTltss%2fBQ7%D+TcTm1hGSmFwe5HfS@eL1cspRe}=ZsuekGsG(%y_et}0 zm;;El*@Lyfg&L?8m6fkaRFNY{^4%|CbO~|v{3pwhZNT|5g@xuFH9WvKMM)aAz-{ro zn*O0O*+9Ua)Yl;+LElg`hMrH|>xdeV2Lc zy?cZ`+RcN{6e1HwTG}>5K369-?TxLVsm3(uXQkua?O@$}v~nGBIvW)(zD*h2f+V32 z%Z0UsOInKlx?Ldgn;qK59+Dp-z+!4|Xr`|8gd~T70rT8W&tls=jlF7Omvupoorbbj zd~VvyUNgE`a<_8jgb|}RcgYE18y`}t+^%zjzfe))JL%{QMU6Jn$3iKEy{79=KdGvZ zf3#XGmYc!qo0-;4c`!<5Rb<~Cb70!4;u?|=60n7LiPsf3vMTQ=j#Ou?7(l$hh-7*m{<1tKQ=nW^>GclbWE7=%9^ zbKlMLW7M53$JO1j+80MBv_UM(A$fzk7X^x~uQS;sI+gALwK*W8X1q$pqfPcs3A3`Z zA1DB-&H`WkyQIyWk7^_Q;flkKL*!IU(Q$~qLLW&ZYz#HZx`{U^=7VJ+ zvkw$OGLa%s*pOaR^<~3Xze^KBUY#U-q^1o%3sj{T5r-ntxNq;(99tXmB2-6~>3bNt z7Kpu7)A1MmTX7Df2`ZD&ndheA?u-_crm8>2kuJT#Nf(N?%NT88SYzJdCOVt#c9@u~ zXQi-qk!T#GwCrOA);Lug&>xR@myrFQ6F)C$qH$?g6T=7dQ+IFD?fA8Q!~ELz#wu-0 zu;unjJwl9*ss^*qoPCz9L_Fk6!}$t0U$`3hV@9CK8r zWZ3LOub>n|k{#0;&^yAEmKGXehY00_r>_A5aWT1RL=lOJ)y!p4Q}}7(>?xY zfPR6gb~nX7MwfhC0?y$c$_^dwDoPkk^6qM28wV9zaCUTsX0niT%T?lQ|NQA;P&}$1 zqj;X1(4124918VtizA2O9JkJ#2CZ#+$Z*;z!}c5!_i&{j5}lxd*&KgR1mT?V`dnOB zF1!0IQpnKg9DsU=+Yu+0Kdz0Xsd_Fa>j7u_BdxX&aqwI##;G2>Cwz5oO@QISZ0T6r)ubyDE7sJKy-^Gp+%?P=ubn3qqJw6U2i+mNrOr}vok{N1%G*VFbq zv4h|_43+v}Ee#xf_X_NlN~Pxf8`!jm@lE$>@GP8omuN#^VxS}Eam-})gR7VuR7C&8 zZa|T`pl-cEz7#@G7LU{rpYZKCgX2t}o9kdAK)nVPouLyRPpA0cps10csEAqa<(1vh zCH&O6#^Zr2+}NY!HOs1t|j6@l$5<&%w3<)~xsN330!hu-Ox4fKF4 zwcI~Lg8xHcXTKxB_u4M{>*`XGQF45}Y@A(SEc9uE`orUI+q1F-w@2qgS3=6RC+EgP zS9O5tiN}`t`PI$@ye)K0R83a{nF&+RK|muh#)VSsC`(ngsp$bdtP$A1OmF<_PZ}17 zyS33K^KmgrQc@5}jOi1yBaR7tKI6{#N`t_9LY2VzAPM`UDGD@s-5&friOoi&@>?nS zDMVfO$UXUUVoE9%X_n^eg#z0U`{UDNLz@6a`~l8OF|K1t?sVpo{v z&uM54l&Cc`*%OnW$tphBCET0b$jBhi%z^_bxO?b31JE)-Sja?;$WWP%?Zf_VEVFa@ z{moj6l4{0qJs%a4NO{VRMqH96#^z^S7A_IR-qm>?&xf`tBR+txe-d6l7N_b}rwA!C zl_#C7%{b+M2n5dSY!qH3p>;OyXRaq#)mr=^-t^=N994#MitK1EzMSiIvhcsdd#7gV zWA$-WDcxpyxH5AM_JpRI-9;>EANU=z@E3+C>FD-+pCY3(KjC1DhIFSA~@vZ?y%V|^{gAI)*Ax6KSdtB(Q@n{-!5?g<#m+5S{+rD zPflCev3yPmQFCI{4R2kRmh$9MRHLY|8*+F|TsakuuSq4`9%bw|w-;`rFnS8HTk}?c zT(NJ65#K}}J&PxyLy?V13m?6(A15(k0~+FceDMP%9e)*3GR=Cwsnb<6_<6W^HZfPK zaZJgxGN>i+zQ*{!=LB1rwsL^UTj71iMhzlWy2(Tm@NVw14mtj+4pUC~8yAFGpijv# z7*)n_?bM;0h1Br!t9q&V^DN>X$;aWCOZT-M5AH5it2lM%BgyIzkC zVG-IiLrtkQPBY{FMIMpn_<$+Y$0xrg8?@Ik&*O?R1=^#+_wD(sHk5a1h@>_a%| z!-TI5fA+BM_|3_jeXv<6OZV+iV3qNd-#6bzh6@_`kye`Lo0<&#A}g+L<;01wM)B3a z7po8@Ufg6t6#D?n9rdO3_{DYYBxaONx1~HnAqfXg2{|3*BGi-Ogg#yB=#&ewGnAnU zg}G6tk#Uz4BS_LC&yxthu%i=qkvYr!z01k!L-Ac*I;GY*)smglJy}~Ti0)g4?shpe zexd}4k9Dj~R6LS?Pxm4>xd*ehnd#QvKOKIFMoV~#wyJLBHR5;iYo(+R{xk2wQV75E zoNC)3*dgM_)qB;uf>1}ue?WIFFD%0ZnHc$weM83Tc1$S-rNMfp6yutcR39~?c{gV^ z9%PL@+**)=zu5^N!)DVWDpT+5xrn;$>Y^)%Ky5s0_KM`y5v&GBWkw>+1JY4wUnW$v z$7`EzCzceW_MrX~E9_Tk~VGW_LZ@QVNt(2B0Z&o8f?S}lrh%lN2Gly3B9BenV#XS;0X zqd2pxRB=Qys9or-Ot+Ot!Ovx$yJ0#+yjkf{^Fnp;Od|NiYdx2W(*j8l7T8v&WZ88i z&h#H=FG<{DeUE!#a`vWKQT~sPaQ_d%fQ$B%Oma=F*MU)lL7tRB%|u04ce+EuHhsPQ zx|9O@5AGSZRoYJ+ZQ$&(G*y7Ul?S$Ndn(bUB;JjXVHX)Q!VbQM0M?touos@i1S#e&_=1@wjb2aWL9AWMAH%{~h7GE)Mw{bU9I6DhTNeLmYgBw?@k#*_0W52FxAkf@4 z9IZw1{EL<;ciAA}G;=lwH$1bMQ~bT3R=549u{1RGR8#tmK3-;YJ!2e=2*zGuy9mH{ zmXcHNLYWKJ`%FhZF5@2?{B6 zPLCcUWr+9s`&)<+7i)il|5q?;%<;lS;s`w;JC@qIjm>a5k_g$<~jU zDshH#>phZyg~7d=(wbEyv%Nl44&VoFu7$>y%25Wp)F~|gvstpV1SKPylfG}hT6!vRm|$@c$P@hISZ2#H zE8sii@Cs?uA_QrG(s9bP@JFvBKFrT$s2MrB`Tjar-?MNRCqq*I8l|s9a-9|3$0_qm zn7MM(HquQw@BDYja=pWqG!gI?I9Eo(R3@O*+_>8S??TPqKIJTW)w9mACQoxQI6^_2 zF*-nnpmNuO&dp@imBv)LQlYLVuI$g(PJmf(PT>a3Rr8YHMt_oKZ=H{|m zT6xwqnuMvw^Keau?)G((N6+fofe`*tSfWb2*buchpd zHAPX&3F%p#sIKhcCQafL#CseeSah^*hxtbd`#+{{p)N=pNg*3?duoaXOL?vz18;HM z*+Up}2u6`+@F?!jkz2)W!5x~&=_&=o`H zJ#mrZYZL)@b?zT#apQBnlT*He!~CZ#!ge2iiEQa~bt1<16CDYY^=NHP1V4EL7E;8TWg7w)71ndpIUM2h zarSfX8?LP->$XyAN^6QLLkf#{ZRsw<>~6O6RSy6}B$){57VKfnD^}Wfv}Gl&7xuq2 zI(wIzy-z|+)a=0PX zI1xr!FFY|5;1K#3WL_kAtgAcL0(MulIAhqjCd^Dysdvo^Vd)hsbDenO=~FVW-|&IX z-^J$r0Jb+}^wb{Nt}`bgbC)~3Pa1yIfSOIktV_k!^CivLe{NB0hYDua7}D(tK2vb9)!FSAyNPN z6W8P_bEVU`ugD+cN+Vrr^`@KpSQ7<|! z=QmAJPYXI~kFgdB5x4aAgga!G`9?Df=CVEi?^-``k&$8lCl&=0@V-CONLcZ8vm9sZ3ZrvATv z1b?mn1_zC}r^hte>AbH0w)oJ}07+AVU0kG79vuhYTTSuMz?Ui@*t~F0)jQXZ{+!!a zZ&kwhxb@s6&mK)a?%Po?lndd_xFszdITsb?=p`mYfD$hxqtP6LYt5oU(U zdN=WkrrX8nRNa;hle1Prm+$oVxDusd#@p#OPBIdkCS(eetE3Bo8Y) z<*h}+tWVQdoO(`vWgW5&JIX$Q9+yY7N?a2Y26PGa(i}?_5O}nHP?(`qB%)_brn>9D zD=MI_I#-3WOcF#ICI<5Lb-ps-u=xf-vCW4o-L*_*OopjDGPDC(oLeq_q^%)Zt4-lq zj^q$SCbt3eUMM=LKVSQMz9;|6XnocOOykKt56v7YPl-|FJlwP@N=z#yu(+z(D*nCZ%&TRiVX^a}+aR%V4y6q6jwQ}bYo3pF9(@k5oIkYiJxiEUr zy&n5J$E@h%qVN257@1^tcXT4)bDWN`EzM4fHk5Jqz#V0_1=Lp!Zb#|;6D8wjQ2cKKw*@%(PgR&Rw|XE%AN7UR+*ZIpB2_|Kx&d6sa}pgkNFG>JC_yR zlc1zg53B_!kkXH;f$OFli>^p6ylTNLoLX@qoo4@BdY?+ywfeVvTfB^ay5BK z^bMVcJ>j6Y&U~aRyR&WHOHi4@d52KJAa;Sb@d2XvZFVGeM@f}=x+-;Jvn}o7s;=R5 z9&YadB$idKyc<_#V~k;Eb!I3tSzf>jykP8Db3OhxLz7JEd<107q2dbKx}%v#_>k0F zh3h$N$&?eBOE08&Oe7mma#9)V5v z!VfTd`t)|?0JO1*$d;=80skISb~ zT!aP4Y0EMFS~3Q$QS3sW4)Rh*frGs+SSY3NM$2C1p^duB)*bEOqD)^CSmv z!+(cvmlDY2I6b9zjn>oDiNOssC2cF1>$(4(GTt^87-WPW&yaLdX8{*4v)(kXGhzlT zM_RZyrXsv_<=9(1W$&M~(4!B88d?4adk2WB$a% zkK-R*4g`tgu08CNk7}X(yu_tbBrh7uqLrNm73mN`$r{@0?Cx^Zwg$Ki&zHc%-!WV! zWAP-!^PH%a;s}AVRtfhhhHZK?{C9dCDs15#xNQ+HTuiQ|2`dS4j z#qAp6twule!7LaGy&5x&;sPtoSwbz(dJ+>6Dcy+9FV!Foo+A z70Lxy&)WLnz4B$$?r0RDUQLu!6N3!_yDf9SGJ>~>KYqXf^7_-Rz&+w%GcYAURT0hC zvvIvPn?R)H;ujBP9Ai2#o@SRw*ypZwT1uUmTz_T;;r6zoqiR!943wFJ7~` zlwPC#{050^4!#A=u`5|->}ix?1=*w&-P5c4329@F(oc>=-zC-bxRe6v zYX0OO%Cd2Cz2)5UObR$*9KY;Tl~{tyX#14k=CQ|K^#{|u4l^W>oRI`u1!oEe{9P=d|E{{vQfQPsB2wB z-=0f#K8+0i7%SuXA^*a!zBg)_gDC&AZm^+AkLoh#3i=_>I4BT2;CrgO?TN9Ay% zivDo)UC<-9UkA5KJs&JIKBX<;Zv6nV?853;!OlL_oym=`i>530!tkKUuND7c&SZxo zs3(ulAshG?_IclR9BjrF5Nh+-09Ax;I(9xp)kAtiZZ6jmU|LHS+wz#UGNj7eE1u`h zr?91o&}fx{JSNk`bV@}@i0gCX@kXy{TEyx^>*TLcW{qSps>;HipxfKuHs~?k?Ua1u zPQN{*`~V z8~gkUKfCSul}0^!L${*6lk7aFz1EBg?<(2LowkYgA|ZIMCA9-VIm%Abo&@9Ys-s%F zrQ{E7=ldD!#t?B=RiFvJ)5Am&valGre+Gmi(TUFkUlJW>GO!9nLffFYC!dU&ZML(5 zv~_xFst87OqJY1h8o4@@B>~~miZh$DLVPtqI~C%^j8S4gVAo^nJcp7;3<#D(ot$8} zafhj_{n_t>RGgySnBx4`sRMSV$QnUTf_8Ogii5 zCho0^+&%^Nh)SPi#VN`UzqCNap6-D1V8r!2q{zCHIv#BPG{GLzk4ZW#^(*;Q6N366 z4|NH4SP!my_if|+NdunWj0oSg=Lu;H46X67;w9@i0&C_OA1iV`a9a?yo3lJPz0(25 zmCAvOk;_0;VfI~;?npeU(tM);;GHW6356b9<*zJTU8XSxOLSU897CICfPh-g8W4k0 zjXKoNOrFDDb!*BLCm`IUA>r9v|Jf!}qii7J*^o{~GqBRiPysh&<#h>R&4f&-*;G3z zY2xufNE~6tTaR(E-zmtTA-zQ?+GO9lc~<~>y@J6P)G6%e=SNTX!xm6r0KUwVj`%Am zq$FV7Ax7L(8~unIwlxM+0WbmLI;xZ3z4s2mDwa6MDO7?>A#~q>p3pSn^E-+bPESdW zVArrJW2(ESdS;O>R#P>>^t2x~?5k*+&Sg?cJi zp8efydeRFvEZl2x|Dt~2{xiBYGpDQDZNPQK^UWrLMKj}c6S%>j(VLYuS7Qqmt%^6z z=fs37dE~eS2-Wq6+Urs4T14ST6bdwk!f=*|1!67@4AdPxBTVDhH?|8u(3O1PBjhWF z?g#G>Qw;k=ck$W}Qu?wciuAQKNtP8>-s@B+w@|toN&9g3uxhi6ySib6=k0_sNJ=*C zSWt1Ivps4MLHKZkm6vKcc?B}v0^58e|3BqHV6>`+nb0oiDZ^V@5+EgXB3?(UMWczJ zAuzYBVY!b`3A72#Ah)aXzv{j)GC2qUnx+IO3HGfl%=|0hRi5nHonbfk(A`yEYa3^)pXMVuUZHrq)so^%6{Fjqs`cAbA+a+2DrT>R;dHL@RO-@FzVT=BP zS*KwXo3*`Fq}$g>mLNAgZ48*zf*%7v61$U$+blhpk#xQe4_VG|a6YTZ;@^v(7c7N! z>{)@(bg?w4-Nvnk*Mnvo01lZyJp+$B^QXJF<&?BokMbb(^HxJY@V}BMu9jc*u%9zm zv$B|Um4pQ9p9vhMR?^`emiZeAu30A>SNw;N!dU!c6OoE=om_0g7OmaFoX#~Q!Cm5{ zUWs0bwA{_H`z%!a^QLIz8GX2(D)?AjS*Dw{EUa(V)jG{K?lwuUw$T^sxu^RrUzoh4 zy(Qs7UtYNM?X&JkIA}v(FuJJq(T#QHK-w{NNM6(HR4h@=@d@soqU?EmELqi-AYRnP zsS7u;3BdG{90*wsF&qNBATk_!n^iw{ceK)$~*5S1=coB0Q(J_adA{w5f2WNb&^tfQKD){2w>8o z@X2ud7imb*5~s=5OPl`(mq2L0(vJ!}t|`?csWmhyR1nFEB+zU-X^^`WU1~ZT_lBpf_sEVRFPWF87VFLm7%Q&7+AySAXa_8Y9s#u>fcP#GONiciDN#2gEeil z9}kj*5I`Zzv@&XTm8`_ zcvj7A;5G{&knz&B#i7-pT4eEZ4JYqj|E>qOy8XX)h%kVB9M6&RJqs?5G*DnqemM0KayITe9l{<8H{=sKHJJNP(O zcKpA{035ZQz0|GLXAjhc(m3AUMvY{(o3?o7fvn<^R+;8Wmf}Jtl0qBqcegOR&ejo2 z_+G717AqSFCz|TRjJ2ICYz?eITHeCmMV5HAo03#EYaP6H*3!VmZXDgt@;RLAYiDt8 z=@?1uW{?Rx*I8p-GrG6OkxDRQ5=Ac`$q>%6x#X=r;x5P~a&tI|cEW^&W);OS$h(PJ zB)5($spN1_#USkIZ#t7oXjh8IpBTrJSDu#qPTy%M1*Ma)5&=h!Liu%bn(?t1PSw~+ z`DE9*Mh2<0g+Al?BxG_?Gr>{L;bF44oFW!!LB^_=4{0$ zKKE&&ki3W%m!v(cwutvLFWkJ!mbU75vz7~a@6D3(65XY^d5tTX41(hdk8vHY7CQ+E zhI!{>aS8?!WW+&2Gg!?(mJJ&&D~v~y@K$S-wtION?%|>9xOKN~!yAaq7d?|~9BTSq z!8s}_W2|wrOG6-*JLKnP6xeE6ab23y%n36gYuN+EZpjs{$=0qGG1n~si#!50Zmofj z@r7QofZ716xv5og{{Tjfy1$VEmyoP-j1{SDxb8mE7+IL7tZ%;#?k+fcX`+>0))@`t zFb+dmY~<>>jUp2U(jNI^Sm3wS65F$86MezAlkV;30=WB_`zLwChDnMnA!+)_j!9lS zNnwsyvQjADd#<5zaS4x)m19X^{E>W!R79Scne|`Y1h*?(Z{0nIA$DyqxdCs;+s3Gd z5pP#+k*&K-@vlrG2@$~}rjb!@5f~VoA!7&aqsv>tsE*p2J8XZ)R**w9%V`$hX9xn` zEMFq#Nc3ra*cPs}R~SN0R4&UhvoFATHIH*pr(H=V0XeAUaDR}lm!6drdo;FpDIdiF z9-Levb#?|?gYn73^oy0r1#6hLlHIMd9OTUbv_+IzAGNDl zBxE@uwj$;ibrGtf_Aw|8U7{>x?8j{Jzv}-0s{2%p>uD0VCdqNwW7cm7-~j-e|p+-Xur2D6(1hO?)i^ zTDr76e7RXZ^SL##~T^iUzQlB`MScgz9Eg{O0>CUkytRAIQuSA zE6ZsMM^VkuZ18qOA88`KyXsjlMD3MZiF9j>HDG`aYGiF%&6LWeR>=f*{{Ty=0zX>n1_tenHZISG1NZDnfEYw#nO z88{>V0PpeF)RXS6)2f4BZ!$KL(Sd2?6l&u*ef>DE1xQygn5NmA((SjvqX z!4!;xMQGxZt}WyXZD_S|0a;Dj#)AGgX(v^=xnd(u@X_WfyK8YON=2o-*OJLBQj7jc zBHcDN%GnLzDIlC;WKOsS9wFifk~uS)`CFv>l{T{4UoIV%PS?4Q$zxXXB(VK9%}134 z*CBJ2wDWNbtD_tMYmt{VYZ!_-VBWsfqfr|PSpi?jtTrGDY<2ATElnFOxCA1p-F7D4 zFpJ3`5)YB_j~3H(SNRk|mzI%PT-%rCEnpDVz|^ZBQ7A4QqV9GfM8;K$JC_ldB4xfw zVizb{Irc}GG`mF7&2bYv(%VA}QbP4Cml2XAdqA?$irJ@~#7W1=J#mrTLszlI_Z*Ft zzuRt*&cmuud~1pyuBzzp=rBOr6=BGJI~!94V!1nHo--g|k=jVFv&RJLZFtT`PMEK@ zVK@|u=}(nQsZ3Ee#jVt^vWbMp+K-37d|lXFcehwtk~U{V9hV9DTH02v0?7vT5bLEu z**cEziayoW`|0YD$J@-Rc7C+QsGUXHMChtxSuKL3(nw)`K(&pCl1OeD){Kz$8_716 z?sFD(FhL<9fsGLw<6`l($_Zl{zid%UHN2}EiI&z~!TZ5eCuDZ;TgLNC2i!S%Y~glr zkd~J5Eo$E4+GUVN%Q6`tiyHp`LPau3v89xuk~FYvn{-7h*&`y%oq{N2kjZc)XO=jm5cHt$T9)E@B92MS?Tzkk zRqZV<<09hj?o~sqkwjx=cc)+%KCUumNVbic9yi=@(*ZAx*C7`0E$1HZKhn;EdxE9nTbf{ zj)ajKnHdt{hG6@afJtfO~!%O!S(2mH! z0XqU@kt7~bT*#iaAk|`S%3SL&?fV7P)x7SfzAP!q*F9h^t&O`qM;pOfOl}$cTV2g) zFCCs>7!_eq`MO0a7bcdkn^-@Oh{Q^A6k&6KRGL-Le?$RH*k@EE_^Ydk;Rg9!Lk}S} zTX9gtV?|mm>71bz?N=OamBn6gldO~3JO)&f6b$o86QaxfcJ>>2r67xxQwBQ`Bo^^K z%x(7g;cno#WYSqKu~G9^JKSB|OD>|l zF)Wd&4+|G{0fE>4Mx+)4#UrUr<=tm?VZLQcca!nMU6$q9+B$5=n?jW*=@A7`mILlp zg1c0)4uNpbBP%#y2r#j!MntNG3~8KKjz${tI}y5N8V0 zna;h9jEy+|00#C(D`4#rp5z4O8#3|#0FKyViE416WV(fE`D6@lCX&9&;^nOP`+HT< zAq4GB>fn+x*vnD^)JiJ`a_(_U{><+{uD;1rPD2ag1H4yaP9E8!xZ`i)jk}DCon|3q zax@ahB?)C(+_fnsrAF;RD%O(hd#THmNySTbV#t^FD2J1@!R4Z(%9?IQV_$oDUw3>- zxW9UKx-?cw5w2jjySBED-I->$G07r@1IhL@l9n_0q;k>m7jjtLABy>|O5d(atU4Bl zp^@{p8*ek8#D5(*HDm1ZHMuDl-14!;%Nw%9B)^O`#l`cqb~8%Q*!8Klh#m1xJRoZL ztyKx4`VP=)S86?Cn|*eO89qBGm2_onJkT)K9ha>UC0!!ATAn*ggnkCx8~Z*=+P?j( z@8=cw*Py-cAj7is)-FwS%4k~}HsDuEP=-B4z7=7`C9Kb17*PZ znqC1ZcnfSN1;^FD9b*H3e=EqKi4(J`Wnn}ePEvPfWRY+qz^)0^>&t{x~+`1`-Mx|@-?m?V2k6cB`u%KNn!(R{rK*;K!d@+oBw z-c;-bNu2hk(iD-`4MD{-Mko_ovZ}B#PbpZ=9aJ?2Y;Q^nDntw5(iRnWWovg=pT~bB z_7cL&7qGVR4Tkk4hFAPjv0ft3P~z;eIQt<{!30&0{1i}8L1}1E`Z1xJ>+E}v(U;4v zDnKaXtF0MIC0JZbZ!N4T96-j!TicX^IW6O0RvU(KOY2{?#geI;7bfOtw~i(1iR`0# zds~}&<1V4@jCf?g$uu)eMjvdrrN}XU^ugMJ7>f-gvf-70j!Ct5msUqOw?Zj{(`G7* zN>jXXIw+40{)B;SRUOc?wie*$wxnp9OO7(qN;VUtXz|mTGyVSn;wWjRC<@hUQCiXQ zTTnDjWQLI>cVQE(me>*lN8tQraz0!ATwTlE+rY8}Ra~4A&Dh&p-D2M>V~?0`@&)4)hwF&{3>`DoYh}9oHdcR@}XW^r0DL zjai}uBFBR#TufL2yDYOvj3rf4(zL|9pKeLtc@zga>UB>txFjdMtt77_q-+*#shOmv zG2+@oiCpOo$6BL?R=A2fX~v>hkx`do$1T=XtfFdbX_Nl|509cbM`z1!D|MnpGgeJx z(WvNotCfl4xbqv~>RbnL;&cL&Q%!_!0^!*hir8SX*DuHSNh0LG`k6yk+bXD45oX%o zf4UNWG6t@3AlNQ*NZ4%E#htv%6c^Tvyw|F-Qu|bi!%*wNBbhf)|SycM6_$`L<-5r%Ez~0&1@-O205a1Ynx=LZ>*gRVX6*R z`rfU1duiARWQg0xtdTZK9?j%JCuT`cwnA3MN;1B>g8u-tE*q?%4gqj~AS>*pz_<@3 zMrA}-IqMDtL`l@OsM#YJ9a_h5(Xw7C2IVp?Sk!kBEk`H2#FA8zNVUGS4%Fh0)O`hQ zTUJd8Xn`QRhq4wL38VJQ?~#>ICF5@uBKw1NQT^$P-6f4C4&WsF7;h-s-WHD5<2`qv zM{jmakzEB5Oc$dqb8n=4Rie*t4TKsFIshZGN3XVlDHR1_R;IOAj!r2Ybn+HP+nZ&0 zZmjNWp|)Fi#XYjBu!RIr$s$Q_D3?|Rp(TWEwj_*1f=G;60s{0?+8h$o#FVYru`mkL z3UMKfi9nBCBxmYC`byHMiyMDyCY5ew3}$6Wrei>X930)Imr1@&IP6&46%wmEZ<30wp2PhGDo9~bf-8`3_`FnP zS;Fl~GCan<6-MHizEy#y%MC!OtnKBit|~~`c^*azx8?06A8J`d8q`{&T}y0ZXAsC7 zwB4*;Ry4%2yVQ{#&Y@9}hQ0@}fTGDU+M-4Wb_C4e_kgPS5}j&3vqMCtal9uB7(+B0 z=0|ANoyzR-QsZZWC#h_pc9IEFv-Qnpvp~>4MfyyE>PAq$9G=Wr-=uI|Uv-OLxgtkU zHC3j{ukA-Jp?vBJlbXV@&Rdr_vb9xPZ^x*Kg#rN2<|6@(F~urA2BwN_9=;{9ibcBO zV<6hzSxFBiByA1E7t!2C^yrceV+bG13lkje?IQ|4sPQpO6t7+Kt4e^GoF-hyLMRM z^B@YUeYYu0+a0xLwT|G)YQmXH8qIH83I?-TqvSk$Q|T3PS1_VR<-o$cK~!V1m%zs7 z0=yatMod=0YWN4_Vf8Ts+3`h)t-R~(1{AIUT~zH%S~~V%RMGG}Q+ZOJC5AT_d_*-J zjrFr7#Ieb>t<0AennC$Ga&Y|I0n&pu6h(!_Hgcqpnwr!yw(Ugv zlj9rEO^J*W`838ip}v2n7^hzo#;&(~Ol?KE3qm;?d1HHKVfON3C1ndPDOJI_SB&|#;FZM~`zlos)TFS5e24ao7EtUSHr}E^O1M~~WfBi% zm1~jZ;j>6?uXzFXmsohEPpYx3*T^U7vBwoDM>|$Lwpe=#_$5XV7Mb?KsuVsC5g*)g zQzu#dT^GU(P*21|Eg%bC6@7Ezn`EW=l|zseNwq9$5mAzlz-^g<+%C!$UZ;$cKOYQ$ zako%9@{=P&{yOPi)xlWJOLgxP2WDLsc^;L(5_PktA|d+Dri!7BvqhEaReBp`UF1#K zTu5~cB%G-<@%V^7imbGZO%VHC+{F^dE$<^%d?mWM9vtBx%y)1YE+`7c4+ep+==rZ1 z!jkt5#QJ&d1!3(Sr7`iU$l%AN57aVzus| z{(-lpP_)OxWy26CgF_2mD&i2yd&VG0XXI@WId~mp_7U6l)P#uJ)XjMv!ZQ|<5QRH( zy=Ev`=})TQ2~HMB^``k`b4pq%EMtvfOcFI}EXaVZPjMR8b=A?d;v++#2zvHca3f(& zfV}JjtYW-U`K)4^zDJC;cu9T_s)svM_+klZAelxsqwQRS;@5;wZI^9e9!}YoGS%cN zQQE(18mkWiAxsn#w%Afsg`u}svr_fbd7I|0?&5|((a%`zSBYf+8g%n4F%;=sUUByB z8qRxpExB1Dsim~KsL`FaVjHZS8sEevoUY-SW9)y8XX;qhs@^BVFa}J@V7Jya$|;pq zC%s6k@2)N;vEj#IQ5|MnFR5B_u^?-oGeg*uMq-wQc&zx%X1rqtMNx>4wG3`Q6$dzZ zC3-p2wSnfPA7{rxQp}dE&aw9ys8%?-yAq$TC_2)DKpAy;+~`bvNW1t^$> zVS4TV0AvheScgk2!bxs+jvI2US2Z=%5euu^o9pN}O)A+$0s4(DUa&=BLWx^Y-hG() z!6v_uTm3`*2&JtKc3KUJI25viT9Xv&1$yr$Gs`eA!?ux+XvR#sNVFRW>}fExb;6HE z`BSonQ&|;~0Ly&{2q8Y&X+z)xq9HW8tts^*1qPJ4Wr#^#c={j&v_OgMduF`ifQ3Hd z+2XzSPMfNQq2Xm8_q)TT5wWGAcZ0?44GwO%D9Ye zt5lSA%FXPuV8+>^GG~NIZs4Q+7wEqvZmpN5I4nahF(2%?#RLJ5vxUIqFxRok_|$et zz6@ZNX7=T1q1*OcCTy63rUmBe^Wgh)sE$6Z@ zh+kBsCf+?4sxuO!1Sae8#}cDE@v7Go+Q}4)dw8kE-NaV&Udx?yvX)h!F$8ICtzK?U z=K1V+g7VwOu*BVcXUJ2#tWnV&b+f4L>S)$5vEsJ$neHku`GxUH<;U_1Z6{oP6n!yU z3W)C;AnbL@k>FN5olP;)o`>brUDnHe5trzO7C?97zi9D&0 z=dtxDts1BYt~9rqt^ zB$pOa2ltAiz3Ug(w%s4(uPz?LfoY{nXzl7{)xURH2r-EqMg|pDuCOA+t0SL&psXA{ zeZ!*fwC~vjcJn2~ag&?tf4Z|DOyaXZ(eX*PS+P;ctW!6sW3Of_DntJOug3PCc{mr` zlZd_7(Hq)E#%CkSJYZqA7$p`wgS$Hlf6+(3SfxN?&e5@DW#76+Tr%NdKHXqQJW)kN z19}*Wm)QvqO^T3!?o_BCuVF3eUkxZmS@BV+(&EM^sW|ymU*;G7EgsxthDhVa(f;TX zK`~t^xZSJ2aDt8Es=7_Yk$kEVJ3wl)`9vh&nG<=sr)+ z$k9qT1r#U>UBwvmErzRsQe>|TxsEaI8Nn;7ND!`w@_~K~%#D&`om;9kx^`rwIgwju zIol^uuuIu4mgk&K#Qq5|&a2lfDwQ8%Qlc$O_MP@n4|OU){B~NBxc-RV8)=3meQK&QnW|5tr|k*UY%||0J z{CeFF&3hZk$9xs}KSk3(=N=xH0<>1IT+6sowt2r;E#hcx!Bwn=VE6|_Y~r;l7-|BY z)+3c&;`k&2g>zUXRVe=76|)J6Tts6eohv|6AsJ;VN0yFE8rxKqgAwqcP*Th_E2*fv zHn>BoB!%D9qN_LcfM@}X`pXz(gS-qJ~bo>y4#hifvx6 zArw&NGb>a*eKE-+IA8^=;b+!0ox4$Poz_cPM55{=4aH`&L}=0Mtsuii?O9V%YQ&Xc z8za{;`%SBL=rFPQW%g76!V4s?u|S}JFy2(;Fk+(!=0l>Xb`m)QK8qR(I3;8E4b(!K zI=PXxt%*V~UX|HO0i&+U$J%z>_0VraC#z8=zxb{K=yqn8Py-ZJtVgFi8i)QJHm@<& z8M@u2Nejz|n4&0Ea=XVfI@AcIuIE4;NA~R#Ejs=?b}`c|Q<0p!s`Va%opSgp+?rfU zKCE#=%1l)$%!SSTwX^j-AayEZ#B=_3u7%s?*QRBG7NRzU?equG!vD&kVf zKsFvgD_EI-kV2Ei{B}(_Jf@6;t&=LT6_QW)qV`QVaOPcNlQAPZhIl3w>h97qRQDvL zF82cT%b&=z!tAx58#Ggh)=@ld1ljRU`=Wj^orkWO6n1$N4M$u+J2`|v1Yt^c;9#vt zLrJjT;RDBv;UUKFv$58q&fpvlzO@OUaid6tjC8}PqlzP~Mp?E)7zv{6DHx<`(udB= z=&Oh8L^M&5$R#wH>}&-jEQ;}iD{7ehQtIkU30!28=JXksKw-PKktegj-Iu8}OqpD< zk9h8XC`MXn)RuL`hAWs=Sz?|^dP=lw7!N_oqYS-%?GzC#ymg~Urz1{TmRI@{_%N=h z2TV$F7n(jBKC)L8vrP~VrHU=XE~zSkf(&|^ZL42hnL`-akh)0wVD8kO8$rI{xXUu= zD9GF3nj5>wj9m#LB}!nbj>=4#H0`*@m;Jozx!OJZ8!KCZL$IHMeAdWTLn|?p(>@HD zOprhNa}jmi{{R$WFBrd$pF=?vs&H60;4_9*xJ~4l<6BevfrAWkta2jEu}XEgiY$hf zOL)X)3vV*S3~~96SmuZBZs6~m=^lX!3WM27l#U>-SQTj7H9Vh(gV;tJRcF|bgvh5Q z10Qz>F3QP>c3!+T%(FzHQZ*DXLJtH2zE+eKRRitDq;0Cap-UFdU6MaE%NrQK*Vu8m z73GY6BOn)71Px_Edc=^Km$Rr~3K6I!zb-RK$((jpDc4v2Lmp!OA#!7r*E5}}3Bar$o5vKr)=eTNko7C_|6?9U)xn1pPeb@`D*ihyV$f5OrQq?LsS2~qrl>`Jky z$_il5MVVcJ>O>n!lTzxcS&K~MBt}lgI5N2kn2~1Mg7{+)n_ZOdQJA5DoudB$?Cvrd z6ovf#n=v_U6rwTC!$~_dh)1lMR9MQQj3n#?TE?bX7Ha(qZ5;v%hiH(I zH6#GV8s;%1(WhuxO~7elFS-az=5-RVlCI(GvlZ+bV}llkyoz@iV3i(3e7j=a)p}yw zF_|<20wdw2J*6J&CMEjcUDPRgv4sE0j1A{*J<0kOoied&Pm+j1pkJ!Yxo0kfnPX>{?{R1>0Q4 z&O(-5npY>TFs!kAC_YzBoaD&Pt0Q3Z38lyJiTf-br-T%j2rgsom6Jzv*GZ|_Xv@scPwN{)JzDe!z_seoQtaNhw&Ua|=-cDTY)r#?8?Lg%0tolkP}06BG~b!6V5= zV%s$Wy@lGBY!t)BHd8A}2aGC@xsPCxwku^cat;_t8tj`kSz`r#YB@Dj+hx-cogF|i z^N@)T@mch{X$M`*fLl!w7UpHvd$!oN=@8a9J*q*Oj4x7_F9RprBnCJ%c5|=%n8HVLFajZ0>{T8Fc|hT^yKW=d`E}4JVxi6s87U+!E~h{fMlIH$ zVi_aHzOfGI$Wto6Qe=h!%O=|lqD-br$G>|tk>fbc0f@$i;i;8%48oZB_*OIl5glr1J)@@0#U!=|10(kutK3LRtX# z1og-3Zno%`4;p>EWuryeo%WImQNwnt%M0Khi4@`7M$t9K7T|3o!T^*;?JOmb&mna= zRYNK;J#{5@Vy4uX)k^U`ZkabC0b8k})DN-)g$Y^mp|TYQLKw;a@j!OYH25q#9V4M)OSttSy=6?pq1pKETlG&4tKaqB-HaI^7RxuQQa z*J}s}m6jOU)9xZeCXCu*u2M}bh%0s50gg#hg}D$i%F>>_L3mTbv}`dVEK;jI!|DY{ zjPn)*OSY?un^RM=rI!v7EN1y6s*REb@K;kxR8enVSm4W0{ZzPkw#uZDs(uznloATk zB9?D7Bvn|S!=y$aP$bT(t1@i&_A6iI?4qXTt@UneYX1NubZftrYESd6OULq36T!WI zhJjr;dwAYHF53%dZyR;SXboT0YBj;S?qyJ{I`uioiFb6{X+YbXh(mGwF6TCcXtKl| zLY}xIC&>T9vg;%t(M~FG03dnYz*C2in7V}pv7%0X*6=eu(5!w zA#N?6(a@m4W0yt@+c1rZ2eZ#4N^#si!r5^nmsUuFZ42u_GXU8iqU!8Wl_F!^D@J09 zM}?-ja~WXKebu^KOU+mdX*s?>GIOy!XP1|6@?4u&-2VU|nOYuY&~bMq2L!Cq@V4TU zinUYrmfOb+J9Xig@z5I|x6+%eL;^C8b(CU=Io)+sY_Qmj3jY59`NxehgBomIwKD;) z@_TWQ;ddHevYmMbAY3~vZ77j(9Ca(}JX3YUy3Fd+f>=QPh?E?fbKh?ZXt5V)Z_6bo zRF^X|g-^G7wvfY9Nzp5Hx(N{0)spLqO||CV7Phe}T0gM>=w!;P=w_Z24}WHrFE?&X z+`W#n^9=Nyk0rCs%*t9WURqll<09~?Y912bG4Ynz{{R&nPPWl1=z9H9O+`7{u^FQh z;(eYiVk)Jp7^Py(jU77$IyxbZolISE`l-kGwaoz8bPZt!%2oe0!)ex`3@Y& zaCv==rIY=yFbtKD^>Kpwv;yJ5WLVXmVcyiXlET9FzvEvZ;F}l`2TQ zqbzSJ)|aYEw`Go^2`Yb1eKg8~MRuapmsaMv8RMFhlA62uNd}y|H`-qic*b(PEI3{= z&{x=6ExX%5ls{KY1s-BdiSR^zW6Fw&b1I=#&gC(plIQ;M7c)m9caF0j&4A^c$E6f) zvRYVwXBc*6%4b;=lE~^kO)Gn7X;3+j(E4QeHESU&kxeAK`7#11;+ie%l~WY_708o} zn3*8DWNLVtO4Q~+m1>c-JO2R2Di*t-NNv(FaV&8dH)U90>!^yGoAwPXY7*WOvQ5;B zEHX56D)lsn*LcI3l!t~XRcv5pHdgCP9AE|OZAQT~c!MfA+O2}KHmfPpzhv%4j|^n< zfMnay(b=h=GWQ`eOr|j)+TYdHv=87G*iMdB14SH2%TUPJcKne9)^#+V&2R=3YT3%o zF00v2;~vG6-ZT2I`)12iHeHK>H;C8PomWI}C)lY9{{YC~#NWd1{{Z2{Sd$8~NL3>! zB&nm7k`l2xM;59UOIcVmF_Q}tv=bEwc=byiBro%E(XdA&E;&j~z}*C90U7C5~9vcvQ?|lHPP_CSeE`uuD+M zAbF*>d2SV@u@eZ}!d$+sAd#7*84_jd^mppSs02-prS)bW%*~LQkm(>?HFc9w`Keed z0t*7&nK?~D;OZ8G`}N1z-=u%EpRoOunC<+$vTm00jetxEV(X$`PfpXa$0Vg)2}pKn zR~T&pQy#RWl}CLE1!HDub&;Z!j68Tk@6{NUn337wwBL}(E18R__!<7=iu7Y5MF70K zjcO%iqapjRxgGMzzj83QN!Vn!bw`*;RwQ&t)<~|TxQGLgZY~-+wvO2orL{K;P{va4 z^Tygf&3FK~SXD12?TQZ7ip0mg)CL5Rm7-jVxsQ2WcZtNCM8{_Rf@-K7v#IU}(Z{kU zs+ff@mV9)P=p&Y-&s(w;UGXN)idiebLnvU3;N&clEXgwYB+II|qb?pzwQMs6^bGxR zv1(y~4}G;g0Ah@Hr6Qx(Jd1!W_j{Z%OTWh@#71}%tt!>ORKf%#hVdJ8bwbSS2)QBVeK{~0aZi|v8=OJiL(_e zIdXwT0P4D~)fQfyDy~(b_Kv#;+m#6WZX}P~F#8nm_U}Oo7`;G5erNH`9CCI?vl}{y9wkH{j^INi93LhnJrK* z%B-}-q-0WPYpIo3GP!K~TpYFw4OE8JDFQusB*+A1mq(1@@L;%-MF`)9P;nfXt9S&2 zpUECnDF(1=7bc;8h{Ea$n3bg%g>x?6Hr9-bB^EhCD1^$QLocmvBev{zX#2WVso1)s zgCUiQ;F#pj<efz2c(e_smZmZagV`5i z{dtVD0>m@6=*LBhC-+xeOb+Xck}S6V9PL<6*Zt!Qf&0qEXim*UBF6G&yCVQ9m6Y}c zk%5nAr}v8DezTXD(Js=-HqNTL_jm0Y<8N)F-1R#!3<%wswpv z?BiBAP?7%(X!PFkpvO!8?u}UX|z!m!khM45VD7QOe|twDWAF$A~QORoAoVg z#YmRi+69ixNhq1bV(BB6E1p7AJb93w%`L>yqQ6SP4av5VChL}25vPu8jU9~BuiMDD z{Q3!#v0-utcoDSH1nUf1Fa39RC|%m7VAZhAxbRc4WKyj7`+OFN_Ey?lPTsqulvHJ0 zkR~Eo8MY&2WoXaMPwuMdC5tQ=MABR;)M(EUXOg8F)wy?oj}7p$vzMDCXO9h+b#3YP zk$mBb%H>(AKou2^6}_03tWcFuCdACLR6#{Ipe&AVdo^+uy2CU+*4N;xSj!ythqHD$ zNtRgMR!5y=>$Z{5!*UF7Gu#U};)it$*n=>|B#}n>Nc+Uli-c<#<5**9^hi*3!Ux<< zBLF>GRRXV0C)?WPK&2k{Yu0WQ8qq~LDRpQ&rUzL8s%*X|ht10YBR~GS zKFs4-q%;mLi9MF-u}L3EMz)tt=$Vxh{Z6^7pVmay3*Y$037KNc3X&xgWUQkiG(O?m zcmDu>b-Bk~OuugTCrILrN~;rFoj$H@9m8P6LvvYuL-4cs~v`Qb5SzeV59GvN9?Q2@m2(gi#)AE;ShE1%?50%}nu1-!) zbiEf^eK2%og>sBjz8RAq*Xh}1mR`1BZW7$6cNQrr$C65)(yL6#4a&@N+D-~;%KBV$ z{h1QJ40HH0$LC7!(M5WyEu)l1YN?V{<6b_3%Q3cOg`zf&X1N+^_w2t(YxyKQMmf$4eA8UD z2c$DaMxR3OB3zZ|LUQnk*`5^dsd^S!WtXLvUtu~U%Cm>TIBj*(xD#FaD6ak)Q=v07 zcSic`wdhf_+ue^by(fxE{{UZBis++nZw#r^*2^!kW%b``jlGMaGfjE#?(J7&Xzp(dj$h9*v3r#KjO4UYMb86Gg%pc#TmN3^? zO~yv-jAjXJCLD$OSB!#&Y#)hJN0?DgVs#aj`dvgXKdmp|c{S7JEwWub<*Wo+|3M*)zvTK8dk4QzMrebLdXtEZdoVDAXy%q7E zJldg?mis`06ZFJ5{{RXA;MzWdl_AGf6&njnFYPK;a~n%1MC8YZiyo3jX4+Kd6%?7a z*0MADg41d_W{Ugr>$9ql_pLm*I+xf}LSu5$&wm#mNJc`Gk>X2A(#w-*si6{uk1fh6 zM1yZ4)%Nu)1-6>}2y$t#wTwTgC}(tKHQ5XCFTF^%)Vg9WzLu6+I21r|r951>QqjyC z@jeZ!@U;ytZpqCfbqtxZ)~X(BHbfShT4|c*hTi?#SHiq9wM-$_w6fs(JT=;UPGLbV zB}V+)knNu$W@Oq@##mOKeqf|`Q!vK*D@QQ;aqXWXmZBgxP&=0UK-$$q&1d$$mX31q zPVFAL>#hR-06m!)9w?_p{{T?5&UI1Yt7@pD_Ua~#jqw6li% zN$WkUM}t)=>a zN@v$t=+-ukraZOTH~#=rNN}*6z~Mzpr6I)Z7MMQ%DTc=VF77+-(L476=$bxbX&Y+N zO<(bz4~>r8gk^hQc8B_eqoketZeVu_KG5xiIyFtl^!`z>pqNU_;QcI5+=O;DUEAn? z^qh84eJVt7J%P~n#oo%F2NQl zJ_j+>2FmNbimuJ}GAKK%RUS>W9!KNBt{2}OQ^NB90KX2EcPUqyNRFH0I)|8Ah~fgT zNG0RaI30ucieAu&NBQDFoVGI49j(9q zv}&5c(C{M2_Bqtt!E2){$4l;j4r+BeUJLpphsZQ&7gd<9$Sq>3%c2>Q{ zo0??ZnDR%tq~7teB)j!Oi8yzN6QYJ5Et5@2mYB}Pe5FVSi1AvRAV))@;?YmHl9y9q z^J@GyA27cHndYPXJ8fPMxkhMx)QWvIKpKB^e1Gaf!&}I_!iiJ+tz(j$tZJvb^ppc; z(eRZ6UaLTTSA)$!xfLVTbCq>Q)H`sfxcN9HwXdhoIVhLZrX%LjT-t@C>e){38^S&) zm323<%~){yp%0_}pu7$L08m(tP-3LJP_pyaUW z^Ii#DCCy)na9#kosRTXIU-t9nxM))zYw;T2;R}iNTo7-0G0aNOb^es9M^f7Z;4M9 zw&;V{>#32r)c`X(BL)GIi>-V5G-YsyxA>VK<=qfo<3BRPvz%^^ z9D1V$WdSJtVHK&u;oq9#dDC5xhujLQ{{{T|>zN^IVs`0&NKF^77 z?5XMOsUmo}tW0^Pw4HFbQX~{Zh9?Uc=u_#4k~n9Y?&`ITESAeoVGcKBM65P(2a>b= zA8B{y#1vfc_O@e*T0`@&6ROJ{(+i2U0WFJS6I;bL;0->iZu+Q^J0p+2tIyl2&@9@Z z=u}G6=&?z~Y(Fe1kGko}G>f2WIjpxT4c|p}zG&xeN`A*>z+*H0k%l8^Xjfh>-Z`zz zon{bmY!U$1?2ZnYj3DD6`EHHYK_3n@>Vuu<=CIK*vIB_5iUyzL(P*?@A?(q3+&qf> zNBw=47h{*Tgtq8W-H)QSr8*PUt28LWi>VJPs}-C70PRxF)PK|#duO0zm5Q(RqExZ7 z=Y?JFq98XU9=^)nVSiO#6au!FwqqQk!Hn(zgd zKs(CY>bxa*OILyC$`}2;VmYr1$MUZl{6Riy3$@oMTIQ4HwO%pON^vd(MtP=&)sr(Z zlBMlnY|P4-oawqf?J~$dNr9y2qWM%BgGGm{i%hL}cI1YQ=hZmIWolRUSPBJ$%&lqt zRvOd%%kci|Adf{I+rEpyN1E`Jmcr2cG~Gl6-UA$3t{1eZR@A4DqPMuYf7t!hiWLW& ziWXC*Jr~4RiFVN=@K3X~_kw&Y3}KI%sJfe2KFG2%)6EP=JgKm_tb^=*t-OIDv#RcU zMIZ2^XFEStG<#hbJf0R@9p&uryG5~}k*Q4WUF|woJAszMkVLNiwA$y5Lv>Q-MDuV^ zTb@YV#~ILUj0YZ@EFmb`@r*(MgFt-0jD1m$RWOJ#=&~`o(;jP@g{mAQ3&IwFdaWf} z5$3Q+MZM$=J`!ExT&1{#ZxR5d_FGs`yhL=(2 zMd2=vOEClT=i9Hd@e1*MmOx*K;p(ToC(N(Kk0tno`mcCjK5H$gf0<&7{{YmnN$m1+ z{{Ylqh(vP=MRg3W@#I!JSREeatv7!%x4J4C*jc@0l@}8nyFkz3pJ!J<&yY=O-dHH~djJS@}C$rIVTWol+MZAd|tKk*91j_{h4f%ISXBfWOT z!^7mQbLlp%Gia9hUIJ<1b=kUg3LXY^gvoo$KDT+U^8=Z+T*noe5u{;UT>K3+Sdyg% z?bmgPx5*41N;;@62gylmREF!cuhD+QDdD&7uv?LY*}z!Tn8J6~Ez}NAb#!@Re3V)oQy>{{R!ePiJXk$^0;J z=CM)B6(vt2Fr)NZPcQO1qd~rx5Qv!HRaT=Z)fFn!@lYrP26CpNc)Z*rW-FfZi1c#ZZ}>xHf*5zm7}w&BVajlv?*BS}E0z9*7AQ7e#kN*N@L3Jr6~ z9$5>5Aq(ZD9Ycb(xQ=5*0msz=wEdGvXuIsZAo;HkTp(W9*?6Ykkf)w3pQ7=fXAMUH zzZ9QEmbJr_FZ*_VR(m^R_?CM&{{UtG0B(QOzX{(}2AhJwFuWuzIbuDew0#ktNDFR5 zfVZX7?c3S?)nWM^`g?W)oO#M#4>}e;?ScSEn#i!=8Y!QXs2|tJXub0yBMB+ zi(6`gs1SUYdStcuBXFRu>lbYyW#aL?ENi;J7X@qCk*Y2&$ytRM0d7wvztI6XGp12@ zdBF*$q@KF2^CgPmjAdLrq%Ax`ana+y^{T#1+abjf;6I=CP5y~!YJdwFTTH9e=NKY$H$`Ow>ZG-)?QAs0p*G5sZp18>G=Zqpjz~y)`2PUXi)8-* zq^H{Hg#+0h)>mxJJUTaOWm;`>$l-S$%3H5ds*%se5tR)f7j8FPTv53Z`YEXJUpQ7i8hWDV15(}jpc`;`(oTUmca++G zXBbvCrD{axT6OkJt!Mm_;s=_6d%A^tKK{-cfxc}}>eNX80OLSaVY{0_g$=Ied4y{U zz=5)7czVbAOfLY(RX&+nU@O5MOBEi~0<&|`c&WKbX1I;kX}B%NqUf3&aBN1H5TU#+=GSEw zImF4HFK0rrcU9t*I(1IS>!LXg!jWsfXe)%%)(N{r93M&1n~Bj&8^Ur3G7#Z+nhb-~ zsK%K>BhaT8n_3SGLd1jhpEW!u;m*oUCdkHGxO+7`X~de~8pzVd{{Xo{+BOGr!uMD* zK|Ij5tHd7)FJqYTd^{160}!w+oVeZgS3Q95aZV;ncIcfiZNed?I62LBa-g>2H0X_u zwfwQfzXbmPs4Go6fOK3zYyss?LqfsdSIJ0-**p%J*$xSOffnyvP~C@VDrw z&>GdK2cXZhPx58c?3fw$LG}wBZ=&KO=(SnTvgY9ZmYEqs(6!3v>?;YKqB71Cb;Wj^AO&-3WX?a{iY;Kr)mZS`N-k|N>ADAnzm-}iO|(YO6!B(Nl5|8{ zoywNA$7ux%ZgzPiBMvi-LW7Hyw&}}sL!0OmS{tzdm#MTHlYt%CiG_4b{AF=cbWQ_P zp2zPPIw*Bg{vHra!CmYE@6EEf0de{w*UMYcWMxS(uMalz_Q{0f6Lz^owyV8DlHlR| z051q$5&la<^U70d@m$bATEfbQrwWF^^W8@e>j)4uMZ|gGG{b{V=nVl<5Bw&V zewkTo=5=V*5fcYOi^WWRkv-`IazIhx;L^O z1n{>}vTL}U{cdpC3PtqGTu;Lgu~3lh4DPHZM>$S3T}|AU%Zj7Rxk`$4K|HtiLH6pU zqVH9fIUW}-0rd;<3YcW`w<;VORE<|(CE*gPm>gzG;?a2Kc_?xFD{lKKA63KmUh%Du z;#V|+5iF!F+W^V{v7hJ*z`^{AXHHAReOy!n^m21&T&;2BwD$E_{S_|I9cY_ge?=YJ zjAr6Q6_;g2!J}+SWf0byW!snyS!e<|t8A+tYFS8z$!o6K6;37|VY;Cd=lPd<+BuBD z61be!6Q(kRKORaxlA_QbxCId63Y!|)+!dER^M*o})AJ|`V0@@FVO}rS=ESIyIzsTD z7O<~%NdQPqw4Wn{M6xu>7e$=GM_30&>aBIx97pb_OHPukbu*n26U29dn%iF6U8nS3 z9yef;a)2!k#1IAt)jgIHS)UNXEaR|l8=&f}Xs3DB2sm6+_<4ey1A!d^5*=qH4Gx}U zFZ-7IF%B6#%E7AAt|qkq02ZqachwFY1%YZa3!?abid^ac03d?|lDK8vLgQ#@>H#Vr z4)a_z+v}Bp5#TL6rCcHIJyqtbX}7DBm`fv|LBbb{?t+=ud0P)O#~4{EOV~YEjlWgm zXVrLz)nPu1ye{98wx8vHD~^&xd@_{uYp*UK{lb6MD8tQ--kpBR;^jL&R z;fyOwugJhku(P`rNxhFZT&+#EG2hBsYJ0rw+wcR&>;bf5qnhY!> z9xNj)mo!9zore(|D>h?km?#p#BNNpQ7iZ#~7j{L_vVa;#N^ny~g~JyN1sS=74Ew36f&dT2XTaP9XY9$B9oUBOBXZMK#+Na9rgBP1>he=_)Px*O3gNZrG6Vei@Yp& zYsRg10rFUR6O#lPPtOP%XodQol0K+=$Jj(c(Fl1wrCts~FwpLV!iO=%pi6kXN0cE9 z4XMe;D7@35OOIRiAJrDq?z_n0y$fGY!;l+=4s9|ymZLr*c&*hm&}plgwXVv=3tb?? zktT%_XA1T<55(PJ9`K7}n(-VDG)*{&LCilCqi~bBD1ttjDTUQDx4YF&OTUFp%_HK% z@MrjRSGl=4(Km#~a1$MS#PV*acVa`gDg=vl1zOxYNIcXuG?R%AM0X|IiF^d!@w7zj zB&{`DeH42)`mJSs>*|^9494tt$^xQ$>F+?q0Flb{{U0{D}wSlTAZ6hN=h$RVvGhn8 z7@ldvyS7Ggsq$I0dM4>7l0No7i$x8od1fqc5c61TK8UfyF+OO;q#lY5Cm7R)LIb$_ zD~Dq}3Lvq-gUvKX4&>;KELcWJ)FuEXM~%7v0EEH;dw|HPB*JYf?0ae-mDmM3w`IM( z+)sJ3j?lqQr^MY<0@i`ZBWzrGt6pMxVQ^IQS}gDp>ZDH=(F^kqU}ao1QNrWPO&38wekUH6;!e zpZaOwq*2ENLe`| z6kYX4Fh_w*bk{K~yzgePh4MySs@6yhGs#amLNgh(Xsu3vBAW*oSq|a<@gr>bGy2h6et@T62uX z%F0x({wxFylHOq9ah-L>6GmWX8z;-M~_IH@zGwHwiVtucp8P&dN%q(-uG;P0RCABG!*P^CbRe*d_ zh!5&5Q3VR0-VR_tOPXeEh^G{ z%4>RHE1QGKKzSU<(Mw;$Y?UO%+FgZiVm4MdIDUw+k*0_=J-~-%5o>BhX(e76Yun3o zK&sQ^rNTW^pNwM#Y*!`bf|cuqle#*S)kh)pUMvMWYofFtwySwM;Scx-0A_Xms!d5m z=-sYgj0f_mZEyao{@|1R3l3xVQ--^GICRL!5tR{yt$)Vt!OhXEH?TcYZKKDF`QeOPaXFKNw!&(+Wpsg@bJ~PN0MXY zlHsa-wH)_3*E-^LQE>7>u4^Zzi{S|OcE1|VQ-fi~ba&{OPOjBN7ngWj$veE_gFcAU zcW;R9@}q6QZYByfOT=>13xW$eoO?2|#*n`VA!x@rTK!6y1SlC>ugs6=qITr5 zos)<#F$#W&0k7<|8X{{{BX~o*rst8lEAYSjBR%W0y2UqrQL&aDbCq<@n#cgHe*W7= zR4sj)`)ap9VgCTv*|+(k1D?ZkQ*2y7X`C;1br{Dq13+`zB#DGfK#q7`=sd~v3D12J zYBR#;GYO86>w$|iqA$CMYZy%zobDFBu&v)r}{mtSDUiyMBc!;XPP zr^#r3h{~KJoO?8%Z<^Ia%8y^o1zZMpC3~tp{XxypgZOC^t*T+p=rvV{r|xQT zdGk)-c|A3RDmT98FqrJL#;2OidT)2;WCd}38+kQ{3AXl*Abu^^6|=S%boy5jtD096 zi2Eb>HalG9K;jN;CblX=PM2znolW%W3^rXbhk0I|3q`QgB%f3+dr9XA+E@w@>$e~& z5&NQAK4%Qu5#cnF3dUONL5oS^+R*mBhg=5uFsl>4oCcqTz5p zt3bbX;tlgwwbwhC3sIH4EdK8wOWi^AWc zgH5C!i}0ELmH0H)X$AOgTr5BvkMk&NogEy%7O&NC)~H}~PHB8y&?dRZC8`b-1q(qO z*08lJ27M80Wv>R|8lex7xH*(QA)rl&jpZFdYo=4!;^JKInlQ9>KPq!-(~`k7-MA=H zsYYG-{{Te|BJJ^_i5b`wT*!Exwol|p(oVWb1JzYc@V zJG^#TIHuY4Mmyr(dycTXr#23NzX1BFrYRRQ#2lfv+q#y;%a0yS$~J0xtBc-8K??Iw zhU@}!!<<}p=je%Z+y&mKG`afZsB6oC%DJV(l4Z`vk`6ZDOz!LTyCEw zC+v;W9Q~isAKhS&H3J*0ZL-93(Fa6jYai8P0aNh-7f<;&D_>^ht^J)=aKERs2->)Y z7N2#aeu||AjSP<>fVb9F++WJ3NAm<=0XwWa>bOZTv>4VFa-15_(nkrMk=G~auDJC^ z!1rC5CjlS*IZdYS(DHd(ud3ZUwM$;sH;IoMbU-zd>`AakMeh6u0t7@WW%4?#%YT_% z*5_4j=O_Z#Ys6eM9Te251ds%xWwv}SoVjHAOHnPN1~VIk2m|GVp+U{08t?%Q%)+Nw zvI9&E;3p9{FmQ>IJrDw;U2h~ayyY9*&`7|I5F&$H4%EBuq`!-FZQ(J^SQ<3CLg90* zJwE71(@9bbv4uB4=!|6Sr#@;XKXu?Cy-=Ew%p<_~(>f-^Q(FC34$5>MOPL`Cj(J%! zBSnmmAz?V{jZ+!JF`z!o6`1y9tSvQK`x*&})339tjww*MaJE@e2tGwMz=(ToK5LSZ zzQixg5WouneG_cclH+V+AxwH8@ZfvBT6b!27k>#;d4%H55OsG{UMfh@*HcaI!$Wj- z@)jyMd936fnyQUyXLfkObm0&knA3GFnf+DHd4sWyRB7sn_zzSV_-QyBgc>Z1vb2=} zz&ISo=!LvwW0Lob(`i_cPD;6^L#3__Y>EBXc))w#mUSIh2qb8EwDMOl-H7!?u4}3t zkbgd9Iw^sObnJ_s<5jHDqdhL(xQLP*6QS-fbxsA^X&lpxwcnSLG9)IE=v1B- zH+2kTb@phz+k>8Z=&vQtaU~mwp1#H!b#5n6heaUtQv=NdK9IVU{{So|yF5I-m?|Yf zr~zIj3LBER9tz`is1V>sRjSoN3xpXcyH0@NK_Ggk3+)Sr&ZHD>+c?=Y+k!Aq6QVGi zkE)#(kh!UVxJf>0!_Hdal?{k3m``vep!kB#dCW9QF164(72TJ43$$8-tQKA}+k!Nn z$6QZ|Ih=N!%bjwtStm(y;sSaFXk{TMcB5$$Fq#Jw&mdtB33lnlp6`m|X^W7wfg^p8 zg3#-~+$pBXCpspVG*udc3gW2&_d&Kev*asj=VFdX>xQVeEW#k!F98-{wI zL+b|<0J~UMmku6()jsFN+k_$VIp~eg+dy>mUDPq7UaAS-2g|`aWs+4A!nkn z9CO`fWb;_|0rXH=!}W!eo~ReZAIqW!=@YWt^b3W!=0ezc6~r{;xQX&Wf64;zIoyk7 zghtw{T?f12>aYq3DE4UzLBiR0?W22{w8j*FhN#C5p&EC4*q2DpoGEVuZkz-j$bVJd zym>%VVQ)P94{M|~@eZiH*6WBU3WQrW;7<|-&LP3MZl0^WYp-d@wF1}<2(ipDCAbi2~sKj`Q#@I)75U**7 zm_}4#UC9syp?NKrn#S5Kv+RWK?k%iO)0+u(P6&wS^^O zK=y5fSpNV6lbG#UiROh*4CqcJLvF$1*?2>mPdyMb9U7s}hCh+S^;aDNbs`7{PuU*w zlrXx|I?8jJ8!yQ*s=t@ra9baj*zV9Tv^Oy94@4ledLiBu1=i^Rlo;Gjb=3mwvLX)4 z;hviy=Yr>JZzKT4t=uad;@sv6_;b%HED+tIEfD@jI z2{SPTWzbJGbMwtH<}eKTuX<(LpkZjH4mtY{2$iDGHKC5HbYpCJp@&D3#-Vv^r`f91 zdp1<+Mu#h=s$1=VxRg#koGZTN!tdD-ZWf%#!to~(aj;iYC7z1e96mO*WdSXXxbyVc zYL9B{;NLt#e(BwowLx$^EI-v8>zE4C(`4&9AX@B4FWnI{Ba*S~wjkl&BnYP5iC49b zbZS6OsX(4HbF(stE#aStXuHQ%97pJZG|NJVG)O)`skC39#*2!cI*Cl9PzTUIhVDf+ zn?@#F_NjF@v}ivv1T;jaFtm$u>x4oN$DFQbZP3HH#_9(Y?udmNa+Sy<9zlFr*RS?l z1l?d@EQ1I()f`rn5`L@1?1?K5{%(uKhh|ZU&)G)jQh^*?kuz~CTb;VvW9YK!Q*cu< zre#dsg)=I2QertT(OgCll{5ZhZ<=d{kf9Uof%+_a2_$<9No+V}I+MY;7$Pv6P`VxV zTumBhDbKom_D$n0JojDclZbR~gQEmUDhR@waVNp#g-hD=p>!eHg~p?VhzYlFox<>x zMXt`4w?zK!#jYk?4B)5_nB?V{w^7k>$d3)WLYsBg)a~($lyP(fWpK>(8mXK$8g_?+ z&k%(IMVg17(M3+u$M3cgbE`Br{{Zu;ucBzf&YBd^`bENG8T#c1$>}FVW&Z$0CS2`S zyCE0_WNFQ9GN43na*04m^HZ$yTv<9oZic}>UuO_TK^R<$hMMhQPrZE0}n8o=Vq7b}0As z*;0Hj0$_4M(GjbywL9Oj;17sK5HI7#=lz8&-*QAKEMvciDohVGJ>;T8#meIo&R2w= zByNVv%ttVzlFEV;h~~A<>xSvwW(4~rfNdU2i|kjbg5fGL0a{Kq))#}-XA9;Y&T2#+ zYd`R%UDMkuRlG#VMW=t2HXC-_O70e(cEXJZMIc})jdztSbDjK17XbFg$}Mn0Uch?c z9O4v$f2!e5rBg?Ksm<=3$2UnTPP*Y+@$%VSBnzWN3E+I(V?v}%y9P!IH?%Z^r?Iu^ z9ujgosVxl?4laKCA@0~}iLeYNaNT*cRK_+=#G>Z4u6I>=7&|p%9OY_cY@zNRECqsF z%ZUeN{5hN`xVJhz5F*`FwaqQiIcohrRStQ8QK0&+{H8GB{ZmYrHl6?u%I^crjKMl1 z?&Kd7gzPv7j|@tWsa_fOPM*T8ISURg3l%*|?{AG_gUcxoT*=^Qq{qgE-VCVB}~2}8%n_$9%T|54^@3n{>Li=hoL}$ zuiZw{gJr~pt-T>b&DhhDxwN7>uZeiN=(az`qypdJ!Zz1?V`mGO7jsvjFjP8)UU1MH zpJ5_QkVHbh_nhY_wXgK#fDd?cn{0uoOo=;^xGG*9rWbdcj*f|0KV)f>2T*#We-OLC zPA8hXv{k1qFxN2Uv-_gQ#<)Dn5E>lZ5Vrat*S_1$t-`i0jzI{C*iNak$adf>T6?+s zDPaHssobvZ#9b1aU^xD$63ZtRqUTi_{Hqm&9zY-m5gJAc?&`FPjrE?W2k^M^S-)Or zmQ>2mv!d}~Z|1VI?WITNawtXa0Y7BcnuU;d!oyq? z2#+;xLrzpvVPu<+6kMB9o4zdw#BxNp4$zKEbbC`VP7vJ4X5@^H9&jWk&KTd*9W$c>YN%caMc#R(B7)>;c6fCAh>AI@6|}{ zE&Y)W4ecEoQ(tqbwkE}8DuWsV<#U)^?RCN;vu%5H-r%oj1;^!9nNhOD`7J>9VL?$E zZnXtr0z`^!k5pVV*<%3%c2qQp>J_t~Svl&sfmV=?7F&VpxM8Pmid`ORFoo}94^&MW zH60qA0s`jIog*r1Hlwo==gNn~#v0vLSQ=*%C0zQ2)3DJ)1UF19Q+AsL?*Y4HA;G!G zQN#Ku3LN1is3YjVs>0P}#ldNfk#T!z4rHRqb!WHb)9S3G8Ax==Osr~4h?2ZgdZQZZ zsx!6W<;{q4H(Bn_!gX9dsg|Cr9k!HtBi;7e4o_?QWdPx*m3zB&GsPIs`zSorYue%( zKx~|;r&X@$zq7oj;HjCI3y-@Ii3VDmU|}-`Ob9}m?GJCtMxIIyPV;#vJH2R)cm`K_ z#ZhobpU$|dKl!#$%;Pel^96U5S~CMov?+V;IsqSa?&`-p=_3dN<_B&8mH2qmnjlLv zzKh<5<01?pNzQf6@RRW@hP(MzpjCOkm%S6E8S7F3`@#`Rq%NTLCt7y@QkAuN&BdG1>Q<7c6E+u zwb-cRguBlO&H&_AVmE|94l9>XQE}Uzi^V5oL-EmE)G>Sf)1Ohnl=ogI z)G^^`Ug$QA{Z}1lzGqV_JD*=*1mjdXBX*@feE!HlYhFmZ8mmTjCz=N{$r+4tQyOy% zzV3@>Uc8Z}!&&k^2W2wm*6%Azi6iaobw7w@zH5QxJ*I8a6G<@`lt6fM)$S3omABD& z$VH$R4sx0r!~GBr?)?!r0konej|~ykRDE``pO-IGIJ4%mTp-McCZ6&!I-~CnHOj%0 zzE!meZ({Ce%z*;`&7d?$U&=kg)Bozio8J*NNd|2v- z6_d>eJ4tIbb*x-1Dd_KY1pVBExfcxEt9gqE>IZ+bXNldSvXj#=blXxoZ3uf z2Kh-qxz2Z*jfN9^;ZMUbrx8BElyjdf1&!06i7zl$j5yBOMq2jTbtfnWz~;R$bw_sv zgCnZprW+dDl=gO-wQYQHILd?C4MOaTh(e}jAquP%?RmP}5Da}YNH{~IZb;c~yDP8P zW4ia0*wMEVneX zctf0iB8hH@VYAU((SkmR0AzV+xPgAzUJf1Dpc5w=XtSv6y3^8BM_(m0;B$eLBUs%U zgvaqti!ifh8Dh8OC zT7W#YQVFY(#1s;J3e1zyZ=&9LsHVbyfMqw4>mOC#RHabWV~2$5Hd<$@uEN0MX^9)4 zDY31`h#Vur(o?h}NY>OlHJ`$NWt&$GKs^_E-iMzx4dEM<-+kSKi*5U;bhz$xLEYOb zZN#I7hbu;?VdMGG4+IWSoaW&9qGCF@pvOBq z9%|5bQSlWH)jiMy`li3MKJrFc;REQVl`&1Tn_Duo!;LgSz#h0#*K5om01}M4M@6AL z$Qmg+{ggWCgx*a$!pQZvR10IT^;mF@MGg;C(B1V~o~S#1sie=MxEPa?RQIlXhr+?3 zMU*Kuon4ZytyRW(=!_Xa?t?}Y4K~NI<6bhOlEN(16RJBEXyUnDLWppY)ivw(rXu{iWw0E3%v?y^XK zo)eAkA`u5uxKWJ$MK>KGHK0f4gauO3=7EwUs>Yz@S|Dfar<%T0L{F@&{T!`!`70-^ zsThEUW^*bv&(#7L_L6cVR7VqkDsXV|42L2G)X6}an(qj}9(p5pyOSAMI{dj&E+?Yk zUwf%M?UO3AJI@P%0H{u;?Z&9GrlSr*h%gRX-BiRz zbL_(+b>^=AcvHjc59)zV3@6If&6~ zGxl63(LkB=)p&UKlsmjc+PM;7}l$QBXLRbisQd9-WvQBJ12YX}z#XCDi# zM(S^GQs3yJnWs{DD0ccHTF}AOU01bIHtoB-ly+)yjF*0?x7Bl}Wb6#?j01AYJrE`| zQ`H?Os%xk0nj?IB2%XVD=4Ax~DqL10*#Hz8TL+r%-03H-$*$GD9(pW`OiaS#2hP>S zYJ!A`PLk5D2M5&>HR-x**`XgIJOEJx?z_G%Cq(Yhz#CSWnTH5(hmLT`*@))eA#_lkrM(9@BCAF7oV&HtU4Y1*0*a)e)%W z3fqK6i;EmTMFpezzp8D8{hx|3@7Sl(HO;JXZZRQ4n4eM#4uTOoPKl5~_uA6lQnk%9uUdnEFs>eSFQs(DI#;Du%0T()Poe*@nTb*!9x$pZU zVFnNfKyVJ~;KsDuqBSiSJ<%zwacFCF2*s|A6oNq-p^`(fhbY18D-t?vup~yMcdf}z zE{=Xk+|w;6kr4g1Ml-$&E`a7cWBV@9*dvU>$xvPPT$XiD+^^f&t~sp{&UQdFWG!PW zNnBW5{Qa2=#r@X_G0A8aHC$8CGQuFaaEx?NL`plg5b#8L!h+vZ?2L%&vmc_%Nh6Zs zbAg@8CdV30GV>VqM~GTSqF|vGv<((hZTwaOeB))~FzqK#q8Csh&LC-pXLNCp4v4+a zYg+#R#FY)I9Aa=+hG&{Cs3taqNe^s@2a@-gw_A{C0nO&T4C@0`!E=2OF9$tx73>Xd znBkNu8kaj@Q4Q!+ImQmTQM&Oo`5}N@HA4^r@WJz6Xjd|*YeFS}R0ngSbD;7~4sHXc zTeS01WEt@{ZmF=>0A%EDu7l1LW!*u56l;ugTVrWL03`e%>Z!UVv&1(F(BqxP%4&`- zM|3V=>g8w}`k>zJ&2-v1uG9Yj%gtO*lHaPzG0SBWvdPn$g#gOYaL-jL4tHE(_Wnig z+flt-<rqU~$xWF7C&*yuvOMc8v}bgxVDv$oL2vboLbIQ@qqVLzF#+ z;fDZn3N3LhF3VIlC#sEes<5yT9MGoLwXX8nNqh6C3#9C#cuys)E)%arMnLGU&UtLE z8g7Fa!8?1@ z)~=u7)n4NOY7lv~zq%CPkv<@<)8dI&IJ)8CwFZ_t_i;+?EpHbdr9*_CWoTAbH5#cK z@b-^vsh<)`Y5I(kAO+iZhNBpt|FiP=bLIZ^-;i@qR!sjYdi9AB(|R4!-u zgD1l5f2C1nHq@t5?Z%i@DZjCI+&=@AHq@cVP1tozpz~v?G{J!-7twQt{{S*?cZ#FW z_fYy=f0s{TmcSd8dk+j{&D{dR2>I@r3VYJgI@*Ym4%`@PKw@3)z2HqHj4XG3>6H$`xS8sK=ar}5Rf1MC>^O;6 z2LTAngNC4TM9aRDD->?(n&K^y@gNuh&SzkY4IIY{wq4|Fj0J~B?5rv@cHY8nQw78I zLD1`W%p=@Uuonq*Nk*kwqNkD2r&faI&Bg{$4RLgz4xia~PtmyU>?qps29gT3z`cY= z4CCsi($T6jap)6R-p<>IB*S9~t*|+Sz%rT$w9UBLaW?}HLb23kvl08L6>G7xi=TI* zb)fc%{{Y;~A$tsUP%%1mO$>f{pjvXI#DoL~$22n=9%>1l(K{8FVPVt5t;*J%bl;&( z;tXlfV+t~0YM?=PFumdFo@*vJpiYZfX&UIR7$IT91IiFLT306>L`))DAco{E@{72O zWW*|mqkm6lMRbUsYkBITAfQaQ8-xwVP0(zQs*Fc8IJ{qF02yC|{{Zx_!KvqJ;h_Hj z^q?NeYqYV~AQ?iT>QuaTXU?qeKyd1beXQtS*k6lF{b3J%On*8g)~C>cvN2HSX0gZi zSgBFm{mY6ZGqe*K9l`^-?HDuoU)^GjTo`wU`lmJAG0ng(An5-96{GG4<_ekL|X(j#~Z99${5Ps&$u zRCUGrI{{Ri$_f8Q}&l;`y;N1EP{`SnZV|^TrT!nyG3H* zh4(#Cc^w^%69qs>Zd+;&#z?^m*t$8Zjjg*NBXdh5ZHGiSFLj>~fPj)u#lsM;YlF6K z7P2JCPJ@WfWfF4Bv?nUY@U-JxC%5vo8kDJ*0f%t@%E97xfk3El4&?|um}we#y;Gdq zM_3=JPNL_x-SEquI_3hmv{eBA0REJLDU>@sgwKf51SivXyK_(e&{EpxUEqGph4lg6 zYAat=)WGN341$X))~HAS05L(o;oSC-f?n*DMLx|Rkd?>TSjP{X0#8*?R&^jJ;ir;_ zY*XQ#X9}lir9q}VC9@!^VBe%T940t-O>Yi-=uw$>DP5h8J9H+8qVyA zhqrZgHjA0J^j+78oI#0Ap(T|Fo)C>QR7ubg35C7eYBZ`ofW<%QXEqDfZvinKxbuw^=Tdulj{=8y*7yM=tEtv#5DzqtrC*M&& z{{TT7gNH7wx&_AFWlX;H!Jq8P_V4D)<5a0Aty#C)8t{Lxs^A z^aftilbQGQH7#Tuz{2MMCOs`AcFEzZX0AOnkUo zg3e>Aaea4d#Lw)hc8XWjG)?WETaTieOeK{??K7f>NX}zb&=qaYFlQweHYKRIo(Eyj zG(ufC^1^G{c$hHf4HXyFtRGP2#uE)f@YlCuzry#-ZD(ej^iS;n0O5&o;c*N(O${?| z*VS+`D^CHFk4@FpTM~9f{mtRW!*ojbdI6#a1obGF+X?($?r{hh;+>!d$ zEI9KCex(Gg5|?Tk^WG)=+gfHO8gpM=?RT%8VqU#Wi^g-j5i3l zOPV|py1mWQ8X#F;#fJvugj)U^appPnSJ8QHGU?B$Lf=?^{%MDe&|u*=yUtXMxcnTD zzyS4>c!6|Dx8>@A0vYjVMD6-FV2gF0X@!P(2ciw(KC0FWkIEam6)MqlDU5hd5G|AB&)-$j0Rz=JwOrC%`9-9Ta1+~15u>hdsr}Vf4~T>Qjf5cl7Ox!-H!1g!Qt{?zH2AvBt#qhvJyIV!1^-q0wk=(l_hTr*D z)irK&Cf05dt4XyS(};6qx6^djGrVg@!sejYicCM49wjtf0BHFx{{V#ITN4D9>*p%o z(8G<-`^qk5ZzX#wwU6jm9Y)jxJ{chbMaNlC&lkmGC+eE|otmIJND@jmJ{sLj#uMn* z;;7Gh!}Bz)c(sJ$UxV=SUTZig9wKxlWDngt_eO;_@ROWz1m4YG-qJW>J|LZ6hUZ`r zGYHnCZ6HaB`lnN>2ruH(#G%l67+iHhyE)Z+r?vV+t=T=Iv#lZ+$=~;0@)$vg3YhG4 z!}G^-Z8x-71bMF+bbg8s8_mdo*2hzX4dUOTH_L$OsuvCu)mkt)qDb%z`IQ?&##S~| z$0*r&F}#?C?%nX@IDG;J_6%lO0uhkY8n}!(2IvRn!q-fkV5?=J&D~42jb=}hH34jB zc?2U~ajMd7&m_|z5u}tuXI?I;#5@s@+8NR?8jXQg*%@#&T>_0-FV z92tlx)2i3QqlwNZ?3l__oZ{odErz?*HMAJ|ZUWNBGTtTHXjN}_QiV!SfNlpmr&nO4 zKoSn+M{0XNlqTBe!;iuyJk!amQQ5X8P^>#$ocffIg^6D!fH-k#6n=2}!qwfP=P z`=a33xa6%{=B(C6F*E%YvS(!yGs_6kbMArjN-ljjcaFmz~bA0Fq|KKJF{-VI>s@??-2@K#th;Xe?FyeIrQ8W}_(8{{X|k@hWv&@l$!R=;I@4g_xa}bw~c9 zok=~@wmkYKik+Ma>~G>z)x(pPMVXZ5|=C?rgQPTbzm2OR0fS@kX+nOm=f@L2WUH{ZJj6 zm0EGLfP#st7{;*9sji@HkPjAxT5e^!@;}jHOGm&meu#nEAjcl@(ow5XqA?ca{{TeY z2yvJ`FDO+Q=e&(#=nW-OZ)y_)8hIxM)2R#?YugAmqiQk0YUs*y1#s4$CJ4%;+TE$_ zAmERPukh`u-rCr7?iF@+Y69kHJGd6BN%xe0{#47(QN}%(kEEvfEdcnnQFH^L*U@F! z2LY+I1x6OmIH3oP2*MqvT-P*ga8Urx?dVr|N8UZZi%gy-^F`KGYg_PQPE(7iy{@PP ziGrNQvBkW@@~MW0R=B{5d5)-GP35OtLYA^~yWt6<**u+<-cGuLG(t@Dm2KZd=*ikj zlW1W%%D%&8|RvM|iLsTRwqnlOPb>wAyVt( zHo_h2O{Kd|a*uY~e^hGHW1xIdfP=&4bV1K+oX$(|ySG{_EHP@d+s4N<+oJ9q-YS0V zN5#a1w9n>OOQk*Ua~vWD@UZqr@TT`=w*xR2bzQr_YxPa4KBr}MPRrUVJF8JAfzjkp z0C#1-3%5r8%-L|u^+v#295_hO^o3!uuHFoR=v0E?xpPd9?xo{^b3eLuN`2$@gR*mj zdO^lh+~D(FuFq4= zi9pi~5Mj`q(%M5i=HQP5yN5eohh#+Jczl$7)>l;ygU(f*%XwVVgdao&padCr8!+H? z_8N_;?vAX5Qo92PaTd6Y4^$aZ?Kk*KY5wY3;RhHCyFHPP2Lbvb8sI8yXY874fl2Z3 z=kA+Qv)xtNjIa86r#llNTp8Yxqgm{WN|?BElxc(ER0d%>|blvET zNIqJsuk9wgV& zz!Mi99aC=X<-?Udlj*vFq|=@@YOSWu0^M5KwFdtHq@BWbchm03{{Yl>9Dwl&mSZra zJQb);*nP(m>ct4a@Y1_Yr3~(%M;{=GwjaX(Rj4CQljAScAX0752_9Z*yXAYZsJxE z?5%U@L>I#~9Fv;Y3riKFMC|v4=7a|?!)9|#$@>_b4j>YX1hX*IJvDZ_0?TSO!Y+O zPT^H~onl8s3q45~gdiN0M-lW;*bQjiIyhAFLx+U*!Y9z-GSf0-scTDT?t@==!wl9IwN64~8R?H8GS7-?c`w#frB znOT(`4jv1?-dDSCnj(y~%yvVyA5`j1sN0DU9m{nzoWM7@FMehF0Ng8sM|gSct!A8@ zh!WG#YM|3Lk%9~st8coKx6#2^*E(?|9E8r%-&U=0fZpnMZqgBL*RG zh8S-c)WEH2?TJJqn2Hbuuu1TQeo-BoIqF<|y5r=8Ib>BJFGyxt# zd8sE%>bVoLYmRx9hKy*Zg`;@g6LX(Gmt`;sCzgm(VQW0|D~!3#E;@iyg)+uqlPt<} zd)GD(%DcLP^E)nQuH8^=?YR88a-}VETX7RPm|0Pfr$NzlMZ*W0zN5pxb=f0Um(z0h zrtO(_6)?uRxZhP2-UGRjDXuZzH0C#1F!S>+6G`0;6c&)-jO>AH;Dmd~ag1RDO|QH2 zh26=$u0AICf&!ItF43?Pk7(@y&jt*XLwiLxNyRxE@>K8ex@69U2h*l6+&SO6b@b>q zHOZMxt4W}XZ6KXNTui#(46k=WpBqE6)C;I~i@cCLEPH$^=Tr>*fw)erE4(xjaJvY& zx|4%+Cm|m0#|_9ug_Qc;p-pqJ+O4tw0I^SPU6#>qpWO$OfU%xx1j*RwqR>w<&3mf1 zMzfW~JyWQ6mjjmVJl5XFIkfx2-XO_|Mw{&Hr*^%zI27uX9P0~%L`S^ja;6J1OM!Rl zq+9-_?)$TL#Kiib*P3-Kz&B6Td(04`oZ3usPHA(5?wrYN>F4QS89AzcoZwDBz%-09*+99zfpOU8 z9GGdsH)A;2XXv#$=&3ck5=yeneb5<17iqGn={iIwnel3}vNI?`lQM9Own@)42qbh< zh)o67Zg*Etloa4y_5Bo8txcLhw;?;a?DZ6u7+k>UYA!vZ z*~w+vl)UxqU!+g>5=aYkxcLg%?ZC zNm+fvYn88Iv4-Gw&qaq9U7?aCW&ZAd6;bS~?+F&N4plm@@U`4=oFi>mbN(O@y1%>M zg*4NtYnXgSFs&|WkC#N(260?k?C6cO80O9m@TJWHb{Z&ie+XI#KdOjpOQkf6gMTY@ zKr~jna^}E5w3av>RMdUlViY(FDuCB?cEwy95Fn{{R#J0Eh-R{{U`?ge|5n(7c&)gH5f@`>bdJ@lNG=Zk-Ny)o}?>vO1_Z$znNI-JV531vfvbsWD?0C6H`;H2nfY??T+_l&C6=|&r-)}TRQ-6OSA9^l!@MK+SitsNz|!W7 zV^v54QloDpfwD)KPZu$-jvAZCR6Fk0X||EaH%BgLj|&XD1s)v_BthIL<}=ZE#j`p= zLXOALF>_NE8R8mxpMyix2Eo;#au&LPQeNABmothzD##717a|$0*$P%1?huQ-Iou|;qk*LSKOP>dS)XQfL$wln zyb8bn0MdCJe>ganrcvztAWy`c(>-igNtJjp2;}LHR0CXOVW{Mn3@#dgG!F>WqZM8q zyQMLW-2Q=EY){=>^9*s_#K{h@bmchPVeyF$D&IynO43+5A|E|1GFqU`O3 z6|y->6yQ3Z`B$_U=%j~d_BF@o5ok2Ubf6~9Zcjgindk=cgnwhvL9hBYt zOC6q{sFf{i8RW&9r|1{rKkBnk{{X3F{{U5&E+>V>Q#~@II(*C`<~C!ITvW@JJ2ZMD z6siYv?#w3Q>EDuY4Y+J?0S@uhgMRBhr~}Rl;_XiKVi#7d@1n@6?>C_8eVUkX(46}q zrZ_#VYj-&?z2z?KgN@`YHhh)9G?Dd0Is+VL)MAU;R;_BE*C5j?1Kh% zOl9{_o(BHN;5MK+7MUx(1I=)QqRd)#!fiH7iFTa^Q%j>A7C~|@Yg!4$t1X$=7*4KQ zhoiwT}o_-sXthVH>j|=~lJ3ev9E1Cz@$2bF-wc zgb$*089VK24YL;{1nMA*|)-$Tfs(n#_mH;-;NK2}^! z&eQH+pbzGb4wxtb{gh!CmieokW7SBA<_@ZJJfTTz=jG-U2(}Zuw_W5GDe(MQ$yRZw zU?Up4b#Hd($k=GEnu5-2;dQ5F-L~hrr^Et8lR6`7ryI}inq+sJgD_TFAPn2hTW=n* z%|1SEYS)%|93UyRw8KK~#Ynhl-GU8aE`FU*dy5o;*%`Gpz1jX;ua%pUySKxfMv%Ax zru`&nv}391JC(-9j#$bT+tx?!thSX@-g@0qN`atH= zWGL-7YvPG&x`W#Aa&oW-NnB7*G|>{e@|0u{-f=25>YU@oClYX?lcIz{WK z1c=oKv%)@Ni(6xx8ba{~&ZW6cwd9u%fn4Dul5OOO8GwOvLqfP&1n3HY*&`zmg-y;% zjtfp3dDU^%01Y;j`jNtOB%s=48+F+SR%?u4iB4odCIQ>(r@U|>*b#79d)*l>843xs z5Od87i&%Oojv2|6TZ?%duXpa<%VidW9KD+V0G+Iulv~LE0OVkz3m6+5Bpj#@wef?= zSyr(#zdtm7KyfE3WA3DIxp8CWl@pK6qWMZ~I@HPeUv{ltBkG~C3f7T-!_`??j-?np zD9*{wf5Ig(v7Jg}8FXliYWYCb2C(VLNG|#;-#XxZmfu7gWDW44ppngS$!|DUQFEzs zElm~K{wkNB5LUn4zhFY0T6v%x(E$+6CuA*goq=895@B#Zj&cr($1KdNVSw|rp!*E< zP+mtUY6b`w2`x(UJ2r#TT#|-F%J@9vGwkP6NygZ9m(HzhKwcIj74TgY}7NbzClmHj0Dt{{Wahx`bSHKjg>xI&zO^y*D@VvZ1 zos^OU{iR$)5O7nU2N?yUJyU}nAg0T$o@4hF9_Xv1yzGw}2 za!}q(6zCK2Ej7+YR)$sfk{+%AoW^!sLfGV+ZZp167YRgzCEF}(zEKi1^H!6nM)rEf zRsD*wdwxe~Q(4*$W^NE# zoYL?k4&FyFz0)dGXw)>oP7P-X<|O$eH;kbo(=aDheMgBLVWSX*vS%JFgkTv1Syq<0 z!ZNrT!LTcit9*jIoPLNC;c(CdNoHasYK1=$jFold<5y=y;^7S+6eijDQ8IFXw#J>p zYg$PWI2SBpaRh1PgfqRJ`m8sPsZMm5InGuHfTh2pF}7uKFgx{7*IIcwL!0#WN47um zvJ?Uc`YZdlmri_;d26ZW2!!D02HW>WZE4UQ){KsYHnk^OcN;h^__P+g!JZo9DfoS6#OG`n+@Do2tnbb{QYhi7TkLtk$GWlX_Y zI0JH=GuBrHMuOg2r;}Bn#sV(yTL+t=L%T&Ra&ok=)&5m=HWoM@tBxzM?D3zfvaGVE z-RJC8tt@m*5QVom@|gOmz$QK=ds*FsoN9rMM3X)rH16%qJnjfzjC=q}o7^f6M-CY6^FOev{wEYwQ4J0sA_FL=4% zWh`T2C&iRzjZi)JF;j?V}i1 zT5k&0gZ$0^0C2dmvdow=jSDIpIGO;=D|j=8X^F)d> zBSW&V(r6xNNTPP}Aa145LDfL7O{0*eq20DWk$>MiKa?-~+QK}MC$#pWPv%CUcWF4B z)Kx21dz}un4)Ds8M&dM?K>q-TZj!$SpZZo>-$vy&7%~)$+sJ5~U_s`++==y-G+y{_ z!->B{2WzE<{A|zJT}9N%pHxlV<4%*YM&^(=ye<&l1HJ}zLS?ot6`HNaak`gOv8}{96biJh7$g)3cJQNp!gHEP zCw+n(XI-+USR~__Ol{hZEtDL#*f~wak+L1t$8brEpz5&Q<7I~opNMbKILu-q=@Nq) z;~zLFw%2r?ViROA&OvTeaQO{WWZpTUm})#1o~RkKIfQII;2gF80L;pbQ--7Afuivj zKg%mD8RprQYkNXsfnv_GF zVRGuE?~Evg$jYfcN}am9i2ANz^Iq}&eAEvQ?xFy4m!CButy3Oyh_(qDl`M}X_%i-u zRBF;Q2NB{5+Kv@j%AkYwRuE~t{{Zd`eNYUqYjr!Uy5|ko#cr5c5mtC@S!4~1^0tVU6t4HaOMvCXX&{K?@XgRB(g#;HgWiirQ#V+a)t79j2 zjnQo?RPx^tDjfvvbF!tbcD$9{<;QLm>$By}I(6#l3fDH)xud|i@HA@SkOz%S2RBkl zjT7s+){-H($UwEsH*zb6{u3Nqqj1D#LUXXq1oKU8_XDDD8M<{ED~OU;x_!TJiLj72 zANiTV=A6RQe0-=`nbonPw2(~fn?k)OlHCppWr5Bv$RV=Qrl4yH+f>JI9*AhC=Hz8@ zfsMJKPlsa&k62e_2K`pjqoRNy6U{Q10E+^|x!{-0HCHaiYl) z%}IdP?xF<5;b;ygRBvE7z$@L$G4UA+>SfLT9JKl=t4L`VQ`H90sm9#Khv=I6Os3(W zjfxI%k~MONLrCP@1lI~s@a+!#u#3j*&A-tyr7HdB6huJL3Vq)YIO6*&jX)=2Ro(#E z)nAvhV=@XP_<8b0&C5=^CwF$4+oE8%9NJWX(>M*7O}URXCm-2O)8=$mmiKZXV&o}@ zFvne0^Cxw{bFNjV5#k9{1>IH}_?;mcieza6P`Dh|{gl3$1E2Y`?ZhDz`_7WB4mRuIi1kY7Vnosi)^iZyvCu$HzEXdGZ_(6PlD6kC!)0i)4fWyAMcdaZnb zROt=QkdG6c^C7ks+_!{$Cv^Z?4zQx)da0Kj=umM!en`mmS!+lO3|L{v)(~vKauM)# zK%b~8JGPI^rH=&i(aOr#J+p?t`mcODhkks8PNf-1~K{|CC&iz zPUZ7NlnpVi(W(Y~;EbaHw9cnRERiQ7P%NpUa5$6oQs62Gmi|>Prf!+x)n82A&NWg^ zH#?a@)kpwq3PF>B%L?FZl`al0Zn;)9m^jmP;AVN~O0?Wgx~}o<#@!Q$U~Rm7MSIp= zCxnC;%9;%}D%LU%_}8k80kRHzL~5nB9)op#Gc6;FG3u=@{{Vhy2Au1z=->YUDosA@ z{zAANapf6M@LKLi{{SON2;JNP_dpsr)I1buJ=QtIkYXiW!y7v672VuiJdtD=aNQSU znv=o9F%4O#G(WzV7TirnW!6OP2i%~pC$0XUOpb1BI0%VkZZs#*DKvPvD2o=KeNko z@Vg&H{{U3ijx57e&~y!5dC2rYid+Np&y!Pb8vNY3qD3PB$C{Ql9{!R_A_VgYKE^Sg zP=C6D#@*9?s@p&lw(1Fzc5;V_j0tM|M+Wnp&m;pt4H=V!`#^R=!H!M|-Ps43`F&6> zx_?rd#>2bA^it&5iyL#bddhnj9KT27Y6i;2Pl2OV~W!axH;QJlu65VuC@ z9!TA2o?4-wI4c|>x}ej(geKrx+?~+YPDBJv;~ub!ZPzAKV8j)TeDp(z+qhaBV^yC$ zP;8UFHbA(2Fom2lhHeLBcmq(G;oVGaq-cdYjgaknE2!bao0l8=+D8ShI{Ko=-Pzr} z+(3b*P;(-wevbG+^H&h+ay90fUO_JZ0Do0dTt+mM90Z-lGMi-ZHylt=aHkbNFeD<@ zy6Dn0UhSh9H*4mI@fwZJ79VWmCm{g>HpUjDlrZVH;5)B(b6*;$cNFYds8_*cDa%QPjJTo1K}!=JJu=MnJX0Q%q!WG4gC5e4p@r5FzW z6?D%ua7q0XoRuYwbB@6asMH|LSl$&s;i~@trE$`Ge8>54wV!7--I}4a&dxug0wan_ zbvuHVPI7ix;+^M3onc6eXU!K36h+?`B~`-!57eO1tRN{ck;!o# zd?9#_6^?>DkQTt5Q09!gO-gft=_^npsvs80-B=~t`l#P^oDVgSIw)&MopOlKbU+eg z?ocCMh|G^w-eI}fNNDv<@E7lP$V($#0yR4&OJlCSiIn?)XDb~~c>7u*Jc zOI{1f(%Dh?dDMmRb>^Xf5C#iZ>;x;Pq@rlK*wpM3n{#CDbpc5j^7;ichkmFvz~iL; zh?yhdggAfHgQtALxSNM4PBa#LRR=%tn)yX@VtL*DJdR3L&%LO1}8#xJ0qp3&7#GLWQl<5vt*iv7&Q(8!sbQ z%rqeG)bH^XI`~3t42{Of3`p5X$>hJPf;dxZv}K$w^7i3p*@cxb0uaH}6RHQh^qEna z<;elVq#y(G6K;TwTpP6r!^U+ALxwr3h7X4`%?<7(!k0C~G~s3jcU&ZfAu%YEnA{-P zjBB`BU}*~w*gBGlx(}9%Lp@WBf}>r?LpIMP6Sn0{=5|>d%&j`8v}bTswb~B~@E@vY zc~prjyrxNJ)1o7yfyHi;pbs)iZ=O|;i%y^};i3m4khCl@@U;q^lA*h6c255Q7ee#R zfK03C)w=@WJM&kGeJup0xImmYh8_LWt>NK=*P?5iZKcplOzf@%OI?ElD#*WzOQY_- zRyXdA)6oDO70lXq0PKdS5 zE(cL5^xdmWdv!cQyV5-Iq0ozz>{tQZS?fy zxY}<#I8#xMbe&dNgQ*&onDU&$6o2sc8#KZ-J6XJ)8rK;5?yaWCqTPoz;B!+53~=TY zI$h~1X@cT(1rYcS`>Re5HLv$r8XynUrgowHFORpkPj8~z)WQdl!n8@dGoeBu-1(s* zZbOCu+%5s8vxHmTNcuu8X)fkftvHBOnhr~jiUuMDqg82pI;@c(t|1({sc;|471on+ zO(RXyn``l)=CnSD0dBf0Vc%3qJPSA{;!!7r&Z)MSpUiebZV}>6B4e5dMvN<&n~#M} z;tCm^{FlNbI;{s(VaLLQ{6OrS!>=*A?;7)Kw3V1_h|)?8F&m&7atsV2YDKyuV?+&Q zJAZ_PYH^7WaEEkU=kGhBDZR})eq#@$VI)FS@~Gq zJj(AoePZ)Jh8>06fY!4{ur>iGHJFbNPc=6*7?$)-WX7C9NN9q2?563J0!LKm7r2q7 zx`ZjchffxZ;c)w`G-`<&r_*>a@v1C#9McE<*1sV(4rFYtF4+2_;La$_phFlSd8Wa1 z^-&-RgzkbufDDnHk>j3=vW+Jv>Vc-nGvY*>M-~S)gY?QbMD;^C*{UU^c_#kq?Q)EO z1oKz89dR0>9O!gTN+(?~6Q(~^E%3(ZzRrUv2RI)@*6|U(HBFcU2L|pe5=_qiViPuCLOo6_zoaa|O zNb+diF^25&QtMqV;gb-YTxtGpXyz&WE+s@bk-UEEyER-#T|#|6*V>-a?Jm(Yo69t5 zj1`w&U5zwMWkTlPy7!z{d|Rj20EauQF6*&VFXtKrU)$=6t^!3ioPAex7#ha98UtW2 z6aljLb+M+4#!Csna8gVbvlIUGSO#74l-AhiGmsgCTJUXg;r@uj?Hhy$wZ~B#AaLu! zz}TYOsfQ3a+=*!dcb!i~VFX8nlA;ogU?iS0o?Mi=^j{4XdD{n zWZ1j=BZ6aGtxp!AT-hVd8Iou0o5_Rp3c_PLN_lpkSxsncZ?3E65uE6~-wQxlZM<2O z*qG>77oshgCnk9!TNvt|L-KZnNg9mGI!lI|ExMoCUe&`OyQ*tLLCPBtp6{EQF~!K` zL)!#{=&*bPRcl;gIV>BSI7Q=Zl+(*MN_Te?tBSm2azV~&-=&IWknvTeKkJ zNe1n?a5IDUSCbA0gdLSP7I9C}KIZk&L&Rs@ ziNr4Rv9+PV!EVk*pcc4zuMkz?fybfys+5{|wQTeM05*LT2wVg<<1Xm9-^I!_M%#|z z+}B@*;-I=o$-)CkDcIo%#AR1|br>1yhD4oQp`H)fSmt7UPAlD*gYhYw(g}`Wz8Ol$+mf+jB^W9lYp%f zPQhIn7@1p*b=^CeR!(Cmk&(-)bDzX{>bP)Su`8j(Xp3+29F`m>d0a#mn2@dHAfr>g z(XkOIa-H{0GqBM`q0{2zySK3SdW2^f&ovHt)98Sv*aJ?e-bpaoahKw0MU(8 z9QuxUxB!c5Ij}V|04DdMTQ;@f*&dves~6O!`>k*RG+8%hXXz+0puW5M=(ugp?iwj@ zHvzvzm}vq-*mAqR)pvF9)ox`1A>e#-gl+It;&1Q%Oeib60C40xa));9j;OG(Inm8- zOzw0=xF>L@n2$tBWD}r8gp(VD=VD?{Ra&LoMbHAWptTZDhoZDTNc;Jzb9nSU73Ia) zg9Ty+H$dAbn9*9oCus?!JfB?1t7Z=Ng=o)7Tv(0J8%)YAV|vPMH(DbZLyBD* z1RVB~VHjc75OqE?Ih~cnKt;!Gp%NbP5P{+6*8zJDp_~XFp^lUBax%-wI9K zFJCWCXz)0f_;I?2iMw2AxUFNpm`8}Pt6bK)1^_6{CkYxSw$NIPW=67Y+@%wc8_8yJIIN9TJ)vz~j6-LaRFGn?RXYI;3fm)Yt2Ix)iXr zjp{K!vTj-o#1ZyYJD2xPIW3+O=!4xC(vyR)Kl0@gDY$tfAP}T9aLhsm{{R!Dge=!? zsHl^tEf+1|s)V$7N~ZgDaVQp@KI-Qg#xjT)>H>+|3DKFr*=Fc$Ng4D`6x?6^RiVMn z=2SF@8BIL?1tbnw*%Ab_o)p%$e?;Q@oF@QoyhlF@ZTdB7hGWfs!CPPvtn*g2h9jO6 ztkmeTXQH?lWOz{S_(|ru-S$T4b7vP7BkZRDBaDn9=1ZzZhnnKF4>VpUDbm2_AJI$1 znEE1NvNY<5acqugwdYf+06a70MTer`*y!esMR*mGx<}viHv7Obvtm~iWfSgr)kk#;2X#yTcp5M z1IX81!UN%q1!x)#$}Mf}X*;awHAlRGD&eDW0>h=wMWa!JJkvyaC)8`@gHZ|W&J3o% zyuFVS!Z{=26Q*#Eb=g|d>$y)7if*~U!OF;UTX2Kb7H}|Ij$TMr0qr^j+J)vhHwr`m z^TUO9kS-y)Y3u!$a`?6+bXaij19D6H;R>$0XO^j@p!v56rklJP<17CFP)81Vl?Aa5 zmk@X6u5JP0(=xRnH;9wBk`IaQoiq7Q`CLo(!V``3SdT?9Ba~{KXZs)@1_p%zJAId) zLTh=sQe1Ob}6Se4X}X)!MhSy>-iaplbsZaJM%?;JrH^Fi*CbwXMW zOp}CKz4(*-b|lf)O$cqfTnv8PAYb z@?1C(3V2A;d6f;{bkktPRN~kth|{Mj(n4enL)P47U-C>V&bK`^iE;L!Xi~Vldcb#R?={3Yshr+ zQrUKXsj@LK=DWb{c3Ouv2ZdQB*~@oEmCbu}w~{WR>Vy+_IP*@V;#;xYD_?iJ7Kf*z(th5gfdesg}cCJ7GLeym-T% zqGx$Yv3Ti(T4Eqz4OLFhR9PC06X~6f4>9c5*y?0}PTf>GC&iH<1Y9)pgy!C2C;K35 zh7AO(cKV|a&X`2OkUq+d*&D|BKx!wR0*>tP{HAVErQ>A>bHxa_e7N07d9)JL(%ArF zO0bQm3JZko(KH4QABDMGY$rM15ir*s%BJ@3^DK-Gx+{gvyIzW2z8620u0T1__f5A0 z^C0&%&TZU7k{lQUK;0KO`Ql3M+U+wu&@XV+abz8Gus?_TqqCe5A*Se;HDWSkP71fK zQ*Gca)-;4md<6zm1|dljTYv%|n^YzXW7Ru^vJcfv{{X22Ba6gP$A@9Mn@?F9E1r0c zoe>)a!q$0@9*j?MCT5|zd95L~0g!#osO|mlx zfcsiJS|IrgvLa~Vtr6+fS*0k zX}FRj3IL8-!kThG*sGx1FpP~)?t=+#1Yj$RvC&;v7Ka#9QRHc$L8lESW11vd8?L&j zc!A8T1vf_0P>s1KzdC=oS4E%&@X6I2%fDqfZaE>|RJshxHiFX`O>^FKL*?ZkbOCT+ z81+}N^BWa)L4k{5StbCHA!HeEqHPyCXOKqcJB3X-b4lNta1NRKBQ4IxRnX!&sRj&0 zb6i2FwdJ9$r#P2f4bWM`IwI!QZOnd5rA1U6F{Kg=<>l8}(b-?F27%mh(Zv zV{nUYw4LTvIcbZwI<6LReu(Z)e2^uiP9rJa@yrK8t*GZVbhjzC6Ci6U%cpEFd&eCR z0oeIp8>g*#WNbFxvi+&K|!&v77=q}yyOtc9;iST^5&)_^xZ@rdE|}6 zTzQ2pB?+~z-ElRy1JA^!<8IhaCXj1EnNGNAxK$wAi2#KAPL8;G z?FFqmHwlit({CJQ06;dok3czSgXuNgN5b!jATDz%Mr2|(RS0*3UoSMr(QtQA{S!+n zIoYw;1yq4>X@6v z2H5zDE_a0z+(}a1vS6;z@xHU>nFjrOBG>_k=2r*HW9Y3QxuYjJg{b0BYiZ5fotK8} zDa1^shT7l?%W_PRfopNMG#Ks~)lKYZ1sT>buJ0U3>4n7&$I)=%vy-|G11GLfy6sRd z4u$KBP_#*0Er^pG)L8~KMjRZ|&zdFM<3&xu+%4V98gq?QXx+gJa{)2k;XNS(bBnjk ztkMIlp!v6C?kh>s3Ot%{t{du5BG6FT%xx%V))hZ>XMCX!W}0$Qb6V}CS{oVJIpKyp^;wqX2zCaBG+Z*q>SuK&q#4NOi3UdMMv{SZ z&6tL0joaj{Z84!wE#gAmwd$_OcTu7*jK$ySRcHqYc2)Dc>AC381t*GX{sGD{Yoy6g$`A}xvgNHrA-$drz9Rdj+XkzQ6`XA^}1GNUu z@SDaMba4*cD+Ioyb#Mv5)4A=-ZgsQ$)$PSb>en+&>UpY`_e5o&4w(oCKi&WcyEl5P zg&%qdx!Qn@Zt>vV!V2$);nmAbdm+;s`J!;vj35IV`K>8 zF^nsXL(UX}1;-rIi2#U~6%n0u-5df2AzP9G;-9i-9~RwmrMYO-r#wd%U?y7brExXx zXy2M;&A5yVscqT9_hY<~s=3yJMnb_hgQHN^nd!J!v6w$~YnWPAYGNV^4G#j|s7aSb zs@q5!>V}q1g+uIh-Vlv2H5(uvMs@;JI?!|q_Giqgb3Bo8sjuA*5Hg(Djip|~Bqs(z zJLf1lpzz?Hg;6JGSnts`(r|pyw5fB0hNg50){)F3EU^B6(K*D7i^10cOAW>)jdpH# zH6+t4aIuZj(o>B#jvumpXTT3IKr?aGa6PwOGB*&7E1Ji>vPcuO!iTx7V97g#3#@l} z7S1|K6w78VIL@5;DSOCknjI10PB-f#8M~T&hD)TklypL)uWdNj^K@4=!MGqv!V#eu z8J4JNyKyexm#~3zN!TLRf?@-SPA=YJIiTY*-NL4I8z*al4HC7~X&Wv;xlyHT`mE!k zxv~e$P`R?{gx(Ns@JLMcZ)-V>bt5V*sNxJ!xWu|k}HG>&Cn=s3AgcM}RYVDB0&bU++ix*&09#Rx^h2t>rr z1RYf}?h*pBz~{lxCcq?f(Q)Q-2PG|Y$2bU#Vr57fI!Q+3lq3_Al=eCv3pE=nw7MLr z)VK-Pl69`N-wd2W4LAGwgc zY%~bYgicDapA7L9;u9(eIG!A*REF9xT;535?*qseV9T56oZim?){xw3)lYF$3KNHOSvx5v+kG*o>d zX}6Sx`CcwzR6}tCSf8r9R~)$u!PY#N2Zxbd>P91FFiALSG6puC6(${AyhAv^Lae$Z zfQugU4H%Jby=fL*Ct%bUC=!DubWUFdNxg>>-Fc_?&T z&5)=;wEQIjbF;bGW=-D|Xq-!}j1&XI=4AuL0vqIseo2@>4j|!Z0b7S+R|6t9Ko;v4 zs~XoteU}}!ZTV0Z`1FmDJ{b6}M>5?EBH|&(9%~JmP9fI;PV1 zZl_nn0$~PJbJ*6qSi$q;oYwdsi-29@t`EE6Z`~7MXmL56eG}+{#=WK(`GtEPLmFe< z^HN=*xE2hATXoGEIj8-?buq#qyNR~8M(EP-Sp1 z2*4o@?XSL>-7&3#IiUss5ae@>Ms-6%fn)f(?uc=M)o>trDlOL0Fmu&h*G?p~AmUy> zmqczFebZTVHt$5~XA3z6e=+d$Q08Emx>Qqj#m&|Y^JX zF)5~Vu29Jh<<%P=&{@A#Q!|yHnsLcKNGHP)g#)4K=8M1d#>3)J+L|APE4#9OX;b;O zG9eh^gDt`>b>-k>DR?~r-7w@HZYzkFh(uspkQWdopg|#Ij_Ni5;Y`g2s(h!{7K#TaU)HD9%xl*r*4NE zD0gxREx7j;RzH26k2s&_Du-w?WE`zC-0WSM+(P9o`R-7x`BXWqGIF5xkxxd)IK}>6B@cJK+rZmBPSrgaw=A zs5<;GoFg4Mt%*9dRDqy`=8_o>)*%aNk;^)S8VPHF;= zI;jK?C26T{My3_6?F^6N(Fb>|sC3~UviDT0x_n$P7rUVL`M7GWG;M<*-6^N#srFK7 zhfWAq9dIyKD?9KLtY$D;f(pFw$~QTz%(Dai|%IS(%;of8eI+2=`xsD);4l^ zf}!9TJ9F3Qn^NaXz8kzL#F}RiL}@CW%%x;p*9PJ_9%u@61yBKiKd(exLE>nEYz@=9 zK=*I>Wy3yDtu2w_1}FQW-Alew8JJt+a)Zs$&zft4h0~eYP8`%KzcO$Y<=N|n-f0T8 zQUiphwXi&pcxSsDmCX_5nMJn{Nyj96tAHO7DbQLQtCx7&WS9i&Dqz~vK56;hlBG$I; z!&9DRq&EYZP2suGs%fz6llv>&Lt0%95Sx*9@v5@Y1n;tL^Nwcty>1R=PeGol%Mvp6`ZWBGK8hV^^tX zW~Mptl`RpSsi}Q;=Ujlj?`S9aisP&&s}~cW`X_J`8!4ga;8XV~b_{LNrgOSPD!aLtU;1h;vLWG8##D z#AmNH-mp}CGA)uJ!#g8WAV;9}LYrJbXolu+nC}y|5g3%yE{_aETRSfHo7~pKw&vVf z8u}~hzUpnJDtCiqdqYe3dAb55HO=4=-I0)iXqujU(cPnY)kUWc^;5@g(a8cLTk|3a zI&L#5{wWPOI7XyJPWN775DmD_zGzdMF^;7+kNCqRsX-;^t-ZB*RH#7VbA z8s^*2I;e|?96bP)J6e@VSbyhywM0~|K9@RyWuNZRStin$$;R$V5 z#*o;AK%rUPNdXHxJOPZjt_m$@lQcq*s#p&o0wMjV;Olz#y{6&ng|%FHkP&0p^8
ou?Kd3WrwX zT~nfM4!C&~{>`2PBgm_p=BFU|fog}-x_m=UDdvwN=^3B*{gqbMszo@?bL;vb@>s@} z-F;0+KtH=JYfYt!+nqpEwPi$m`Kls6&~PFhqnH_E%{*R|j1P0*2)@G<$&jdOH;lbYfKUAavp4p<9>ZMrzd zfSuMc{{Sitz)GlMBa$LG4Z0CtVzv9?j28|N2Q?yiQItpmhr`c;s z-vE_$KFr{C%hj#yl;pa6E^$P(_iZL|OaO{Nb-y%y*SzfxxA?#a2X@Cha@*XD)dmEf zAL_sLC(0DVi20>Ybk`HRwJ5_HGvbX9zDU&dQD7h)2}HviIzl8t9So;j-QYNt96VWL zmlKKN@pE0@i#(LL@P%t*J3^M38=(ZdqIK>!YJj!DyU9cYIN|d^>PgD9xz>#e08dE^ z1n}&6pkrlDpopjoOns4}>|aceR0)i1skMdB=UQA2h&h~Nhb5|Arul{5cb5=EV_cz8 zu=j@h$3~urQ~|E7QMb-Gv&lHMz*!k4Jy3he0p1gAg>#wSIyk$$CcT_Z>*D_aWm65z zL=q&S-PDrV;TR*T4J~Vkc6|0JfHjnwbjH42P-*QKX?%T%8zvC;)TeFL2ZSnZqUZ-O z-_m*`#9G5hf__*#^H$RZ&S_}Fr);9;_}|1B+<`iwgN4NPw7FY=c8v9E#X4JJHM)=_m~3?4SP z5e;RvY|P|F+MxNeYT%Agt+BbJ95S1O#nu7^&7LVR*n}$4GRkB+36g&>M2b}S&CUJL zaG+Yx{TBpXH7;%h!7b*48r}7F>8<63;&QZ}1;qe2=5iyyWb`tcDH#BL&=mVAJTc-{ zGqW^*DJwNx-{BxAcWod}&p)yq=V)=CHR5q`{DEmuiQK1u)5DI2Wi-ASM0hk$01dM8=i%j5!wa(^M>C!o@ z<15eZr@8?AsN}jGI>amR=1yQ`Tfu2M{HWUDk)$eaYul3@HBXymyAqumBIp1ExtUGw z-42L{Cv%vNilff@1PgA|ra99wvCu;Ad%VQu51HDiXyH80>n_I8sZK8er*ag15P&@4 zYdqyRM4z}rkA)KU$=GyPRPgduSy`dC9}ch+Ps-xbs8tQkpIA+`wwHKLw)Iw;edC7< z+VKRm{6G$<7CHzY55$jsYi|>Za1$b05)F4&eo|**JHS4zinD;jy~U^i8c%^+}!(2A*oP zu)Bq^%qX`3uneQ#HetZ$M8RF}ws=jrX-*BQ_HfPy{DEHPr+OUN_2fcxok9!qq`9Yb zz#W~HyhO|&G+Es{tf9kHYdKkDH>pM#-8exKh9L3{3Sq`~Ul7hyLnE7Vu5n|x0(3`) z*9_rLcq#JegNU2-E?j2^Ej;}c=ZH>_tmJ%3Zfw&U^Ir?ysaR={#2pO3;f)oLa54ty z3az^uq3+&4n`I|GCk0y9NOo=NgB%-{otC^rs~-KJLKmAY8Vyu5c>bjjLE<^W0`gi! zgD{)}L_)gG2Mz@7XO|=#DadisSArR-15`zjV`LwK2IpTy9euc$LTt8ODb(erHQg3D z*b6#Na;GwUJi>v-0nSqcrAZ;_uLZh6%DJHNk*c^y zk$_p86j~|V__T1xnsMynTsS58!jSe*pm6v(^xaaX^6%nxJBO#DbkcTPY&(k4%qG$_ z+U@|+cHW7PrsmyEutN`CYrq{xy$&RthjK;Ncw9@YZxnRsiKjv3jRM-6j;PY8z}vFu z83K7H7gL7Z1_$bkTElg&!-cXYWi_x{mYq1~%?}Hit4kfHHSo(e=7ub9%?YBJ<2*d) zsty-Nha0A__#2EB#7CCl3ZktKv(|&DkZ_QF*2Onz;1_IRA zo1xr0ZvZ1!omQHy*l6L%`YXFIXa`2QvxENt39g{SMa~492g9*Ud&6B}hCRUD9FjNu$Xur=4Jj`5>1K4j{bOm7Rkb4;`n z?5TqU$Z6OkW+!(I5p_5sA|ho9k_m3}s&zq3UU3}O8ad905l=UhEbLUxCG=tHo zm;^UP86@NqGMEA38T3~Sxz3y&5iu<~PRiJWcbP_`B5j!DgS)vVJVQ{aIqt)C5u&}V zxX;9dM9&cYSG%R-(_;$Qd3K+|taNge*B3Ay!Zm_gR_7R$jvV&6h<1;tQB^UCo1!C z4e`osAD}`$C*-Ru78ZOw*J%aDHE85Qr(L}6O(nQ+oSl#?Xvp&lpoclclGa9l;WnFO z+|zVqH41c%S~X*aGGHTX*yf!XoDca;t5vmF8qt6}KyH{l)nH6ik)-Jxgft!Fb7`4V za~vO$c3~C;tWlpUy3n{R7tq+GdZRm+@3QY`oxNbRR8c(L*deI^zV@OvS zakYLKjX-m@PZoyqGYa>(xVXco34#tx`lCwyWM^e#0k?Oe-tz+>1lEjW>Jf~{#H*cy zv}Q`u*cjb2yA~2h8aBT-a>9p~aF2x-wav6)R0BbyO0ee<Ir~(tat@I8l&0#L{ zFs^oIstsW|kP3GjkaPXxx8|DBsMzei+gcAogUA7=MBK>a@6}aipok}ux?q!{FSY}A zQQeMr1EO$~JA=915q36$uLoZV-Cy%~h$xtIpvv5TFkmo z{{Ru8Dg%VGct%|SHbQA^upISJ?DUP+BZ8p{hZK>55orGagdYsFok&pL3xC|M_LvTJ z(%vq6CNYe3v~as==$%=DSWkA=mVM`Cd%HuQbFmouqTUy==L43@xoa2)d50Fk{{WQd zaKr%H#_PUmd+IsfE@P@-VQY^RNYxJQvf?#q&bqGo<{wXXH#5i*sP>qt#ZO4%|q^jAND&HOTU9%-S@A;7~M8jfktd(F*3_Xg7% z+p5EjlP98Sxv)MR(33wdCJ}H2wDjl}T-iKC72Ua(Hat#2uv~nhGz`7pn+ijPvNYtp zE^9$K8>U4f!ZsSO6my3{4ryjI2$qu$=k`P5Kbr}T$UEay@z4+>Qilykz{{tJcS4+> z(E#~-7&PjgY`31_8xQwQW^OscI2=3jP#uYmsw{I~5tQp>xNw&vWV&!d=e3 zu&28aPdqE0=K1c(Le|5)T;*}#J2ITjwNY*dhh+}ikxpyQTa|DgE{W{} z$>B+GG>&}N3*n$-ozST=*F+~=%Wh^Tcu%E)oz=}~wC^Z5fmyBBKXp=@g+l#w$NWMy zY1Nt~*XbpuHg3x3arnd-Ec8KuRPRd*`JCbv^=UPsj{_IuWVd!cpXiw8Uh9MwgO>F}ve(EhhIHnSy{p}f zx1*PLcaBTLPYj)xcg0j#(AzvGm#S&*>}8^(Kr`r@O7?f&E1iq^19Tn2+jiDMYo1$|XUSa0%ZZk+2nE0H7Y6?T z61AMImC|zFsK{u<`K}Hk8*D^E@Plr*BK!5gv_iGdE^pQr#NMAtyctjfoOHRrDrdSr zEzvi&*JViqsAxlkl3Te(ek@5v!oUHIR(KL5hGcs zO*6td4OF@C;4-*NfdhmT9MD7!hJ{=`HrPd>rtJ}PLm1)982+i1TxQ2>%q9j)ZgXR%RfX=yT~nOrbZ;dO zbJcG0rE zhck|dInoI?J;bJl_hxnGjKAX0ATHG9tzFxQ?*{UPD_o_Zh#GWF?)+n-H;I~=%5>et zU!cGJ!YiQgpb4B^2 zg*t4PKR1zs%%;*~tnT#S{Z*A5!snk5IY3mSG>o?BxK7KubHv@Qmh)6x;qLWq$HE8e z>aD2EmXHW?YrB@*JX|}+B>|4l0la0gkqNbfwD?<)TopQT42TbQsI)fPI4yNTU3d3H zlfOJCFbQ;WO>3Qm_X#_4#_96F=12R4))LFPATILVO;K??#)`_0hQ>y)z3Fupo+h4Y z#D@W@Z+O=nY0V4xAYrWi(2`&~19ei`a$Tl0^+xU;t^SCEjhZ^AIlT95WjV3NM;Aob zx|>adAR;Z|&=8#a3tC!Q-IcEU9acogJ-rYij=;%{(__RNsTe3Zq!Kc4qr~zzzzMMh z=1?vIp>uA_bY2rt`st#0BjN+Y^+n8Y0m=^`g5S%cX>Clj=@~s!SVq4Cc215F`LK+Z z$H0XkIGpY$59)*1L!2 zgt{jjU2>aJ_S0)H**rx}Kuih3dqfMyl8w$cfv$mdIJ9y?k!(O$TmvUm($@|lvC%R! zXp%mhnhTd_Bz>^;~!$$=Nut&N!Sj2pi?RlYtjN zmWy;jrhHNXRy)HQo@f^_)4Czk2S7wZG@9E#B)dkANKt)Rb3w8P#nC#W7}wjx28SAqBVLUM-BN!I&>DyM zYOcD@DDfw~^n1#$05!L8ICAq<9ogLS+17kIC%KJ#1jC0ifU8EO?a()K%|koOh(05> z>9lymjzfshbxk!gZaW0m_C_`Busr}aDu(Vx6~&1Sy9y*2Baa~@U-WP;wkM7 z6?yU;&}}l-jGJXx$)|h1Bb95*1WXyqhh&pJEG{Mw;n_Kb&9SaLM+&1urMB;=SCJ3D zB@Xem9e0a8Q>F{&;W>qdfP9yCk_W`@X}#GF#1RO(t6dA++*|Vm!;cZvh`P`m1|bO^EUWKy&xR0qYnaK76*&Os$veCoKZz)hlYg>5=q6u@=g@67>F zkxs1X*ZZnsV|fYesZ5%0JO(fXAl~iFCBoQ1*-9Sr);XZ(8T3sJV+*^k@xtA_)upg0 z($&LGLU&BPuYE%Abrh|X+X&$~Hu1k2Ds2-@?Kg(`uKtwYzGQl9YKR(*dIZ;)FVoEmW?V)+d7?Ye1k80s zrG_Is%HZK?`HBo+2aA#oVY`pQ2CAX%#iLO=AY;7wMEHVhgf>K$vB;MgAZ!+GI_#ydEv>*0gZE8yr_2-rzzDP!{x~tX}1uI3k~;c$xIOE7z^h3XHC&0HLq^p zG7oD@S~dtVq>&IhCp_jflpeq-v_Uh?KB2G^GyRaJS|OadCX#OqKM;gm%6N8GZf<9y zZ^sPFdaG(@epp@XGb3I|y@Fa|8Zeqk@|1Nu%;>LUd_e|70XvNp2cErE`s{FpH*i`E zbzCI9u8B^#o4FKkz}SGQQ8f$h#jaG}@ifAsTZa}0XLM?YiL`)cPD#+xFT=6XGRK0( z$8=wrcI&+$R&|j1siHJ4so;+m5PR;aPT>X4%4=?HGawJw&0P8=!Nz2_UVdoyYL4UK zhc`HcX+6&X<^yt1?3&k}A~g<}@(JGhmuF>G4kI|^eAO44Y^lSJ?eV^_yO)CcxC|lD znf+7UR<9fFYuY{_57@8AYx@~IKI}Qrg-2Drp|-`a=JF7nb26PuFbaD_L~=}~JU5bq zdZSIaX@X%n!~#o|BlDc6H}ZwTPIXOed^)G&SA;2#3#L_%IE|NQtXeL4%C*vNc2!Ew z%dSt2g8u*zM7*jklN$YyI%8zlon6T`tec#g(i<9Rp61})3YG^J>I6W*9*FdA6icrsI4(57)aGIi>JfueK9EYcI&a|9zycyEP|h9Phh!f`%H#58ODQEwm!P3R#! z>CyCSf(taeITClN;)qMzHT#(LIjKOYV-VS2w$MBlwqneM0v+ zvPtMy|HJ?$5CH%J0s;a80s{d70RR910096IAu&NwVR3njKA7Udq=4RkXI#eSyOtGQj}fgso$e$+(JB7`(q^o)-hb@LIOsXN z#LEmO#3)-9R@tmf_Z|6`oa?0daD=MZ@J#b_YN!G3$M}oB6;Jj=@-M<}JZZd>3_-_~ zQj4{_{v*^u)jlAm!+1IW0JAWBaz5atpjVZ~@7mmY)G$C77CMv>er=bJ5vWr+X}*sz zMb}T1au}XO?Tg1LgNW+2?i$-R+`8BeR2Dw$>FOE)+mLPl0DhrMt->n%izP!u5mMPoLrITg7RUNZ5 zkh#FUOOMR#yaZ${G~JiX`(|D#zZaQS*@hhqCdl+c*blM#VY-#eme_}s=+GD7B zZ{}eJASL;_XT3OJRC&Aq0OUp;W!1*SJrK;}<_d~mh=HaRv0%ds@|m)qFz4>fQmH*+ zTh4HuJwT;e80nqEcy1WvaVS)~MdG_HO!q1%kg&?JSee$u@vAI#Ii*eK6xwZ5;A=3T9W8sM0OD1BfspK8~`}O{{V%cYmdVO+DAM%xkei?%)QX_q*?&MT|~=4LwP*Q zv)Vhpw;om&g^vy@8jV=;jRMh18TQO75*oTr&>1rZmJq1D zEE--V?%7U^76rHj1R z=_{9?RZO5fLfn1CfuV?02WbWU$KwI#556H&M-_OA*{x_{l#=>NAVadcVldm!DUu>? zs(^8PMvxGMS!)mGD{U+;>%kTK%ObtLWv_%T>UM0F)i%|T^D}Kw(QayHAyzT7^(k{@ zH!v6l2sg*-p%6G1PU`ZMs5 zw9Oph9NhE)R}{GpaSYAv8}bopb{?ToZ1QTD4r3X_R1NFkVhS$3IhJ5jQOnA<`im;} zyJFU4a^n8unT~11BjLII#|D3nWarxELRda2pQ;^(6~CAdfDsD;y0V{{%LQH=CxSMs z2E|{*BLF2fOM>zEhT%JeuxsX7Q(^QxVTio4yn*zG^g0%XG5UmwKKDx8gtOPHVr17C?o)pBu<5`#*-%HpSlHaBogcbl=MJ7P;b z3RC%&nXh8wt(fgROwhWpW}#4wj9=nf9qdj=>45{6S#7TGh>Z;ad~@XW5*PV7dDJS` z-virJGWzra#ws{oE!i~+M~5kz$!iBZUCrWL6J*C9sg=8Hm#90kfvHaJ{J_Aa`IhpR z(hjeA<~DD&QoaMGsJ1*os9sx}7`Q0qMwn!b1^n&cW1iiSM?mhFTtC(7V~Oxp#~92m zEN-j|GunR}L!9s83& z_ZrJ-6_3#UM#12zU>FOfmAV&k z16LaLpO~#u#mENla+9;dHLB*DFZ4$2BbJNTm}QfvpNV6YfsXo?48GGVgTYq%m`_Jx z_b|Y59MS#Dqszo9ELXOR?psC6g6_HbohB9dYnk})If8{Hs*QITQJd1DS|?c_Oj4&c z=ZC~GeQB2c*XmhThF=^}0X+aG=A}{H%oV3{hO5vVA_73v$iy{X;1lw2pArh1mfuKaQQ zMf46hWd(x%(4-aHiGAQNc(%QJ0=o~^-~$uED8A6*0JBcEnX6O8M+b-!Z~bmQht$e| z=jwRL+{6*YWLkYgJE?y#BD;8z!SckzA8SGRjtdWNpyvWEb$nc_(VG7ASV|NK@u$Hv z6Q>DLBDR(fzr+QXs|pn@oDXP0x~{8JJ6TVSz(0*bsyYVFGfjS@z4iL*c;itZG`0yS zWbm#d%e2b2InCv5ShD zyWsc>m(J$J(cZe5FfSUjoJux>1ABXpTYa}M=Ma3IH2q}r87lr}Hm-A-Dvg7>mW(xc zAS%Tk^cL<>EW50Fi)Qzt502uhQ%;`Z$#C84J-`+okT^pt#N!AoonkVE1=7dB`HHOR zGtr4_!Jo=sa_^g2Od-samSe0DOcEd?TQ>hL%++ z@swIY$(ievLVhH_^(~9mL%{RnR6?xR4ejmG-G~mnmM1|nuP@^?w~Yhb#QX-yvxRqH5K2y6Z&dhTZmUK#nd1g z7T`MTiGW}&avZAMZAO<)#DgiqW4eM$4A=($0A^Cnh)rL-dzB!%j0tAl*E84MFK^5? z!?txVVJmD8w>+#hw5FC@m}D`tKI$s#2W5Vxxd)JZL7;NZpNVTWUH0d2tw$M<{^3-# zZ0V?q?Q%E#B2`pT%X~4IY0EUOv6d(~Q4+Hty-Nv(&i?>^sdEz88&`e)qc%VviMGlo zchFNM8SLkAx`HzG?0@7&+-00qxbM?6MxZHm!8Qd8{{T%vd$NZ~qA07>{sYr5d04C` zXNU)t3&Y%O(J3Yjztq1hL}1QOpTwo5BOb-S`{rZHAy^1XF;d*37QK3aCO=a~Ce=|W zQNfSQy$xPLOidv*iq+rzECu{TW=IvPPs|@qxfz+l1K7EoR|gS2_>G}DFjX6RV0Kqe zRwE))VjI>TNaSX&NgjtUZ8HtfnM5u52-Lom%zULIuE51A*S0qbX~VyA(zk<_$zzZ% zjLAU5^e|xL`%Ame-7yjJ=TiyoDUHHQ;5iIcwy#m$%-(dwIh~8E;EiYy&G?KBy-KHK z65={SyQhy+K2qDQzHT6Tg0mDIW2%daQGfH?esa}Ql;$m=jn#Zk06IKH#!Z)JjKCL3 zWpz$AZpf^eQE?NLit60rX;Eui|_iCREM>^D^QUzf0zDB zEwOg{4mr3&(z)hN?FgTj%mZmLctyhF#K^xheg!ZqVlS8Jb-<}QeQJ(nJXWHSxZLs5nq2p67T6B=%Sy0eWze6|%&;}abSD@J|^ zsH?CuE~<@+5-QMaP7F(EyWn=bafxJl9Grv0Ej%T-aK+)(CWPYnyS%~d2-J6Xo2xG{ z^0f@w^Z4fCI--uhJB347hy4V0?kc zz0I63wk~2Ds1?vX%POidgny{&vfZ}OJZo`ihKrQ5@7yjO5VejjpsGiAgx6>8Gwy`f zm*OgLXj7W>LAQtsuGg~+Te>X37yZOQ9l)_==e)#aV@rt4SN*xkMA`oUh}=M0WT@JU zTouo(N@@=*E#u0j4({_iL);Br&QfX`G9U2EQkS;9L5U-b2z=}}QQ!C`4&CBqv1~}dh-NTFk9d7J4V~9rxHuNu?KH-!L4q`{t_vX8qO;%aO zhuYITZ`8T_7ezh{3g)7ssY3?YFw| za=B^RuEm`l&jBUlr{{3qT2BL)*Kv+K+8&3P;5`V={EvyH6n3${>Iti9)mt6#3M4)! z)d77bvN(uIM{=kb0LK#*sD=voh~zt58M#`GW}d20D+k>i&w_}OJ9G=?0if$Lo{La< z`jre{?yy95_MZSQD8wZeDn64$kWb$9E_eQn1r!F`>jZe9f6OY(AldwYPEe z`kH~>q4Au<;yjt>3Dp;h`%QspXYGkq?`B`M8q)NqfGx0tE)yN4nF03{WuQnHUO3C+Z) zAvimYQQz?ImZ1p9b}GLcqBsg@yt|j*n9`xJ+$^_(3AkJdb_T%Ce9L%q!LP;3BI&6Q zL(@(ngWlwZPMx|x5y+dhhuSIzaO3wYs&_Wa+S_#VC=O+6D>qLlx(V$JbU5P`4vP$% z>KnGbGM{9Wh7Ze>U+P{AWMnV7))3u5^baBo%KTg|;QAPf;LT)x${NlhA z08OY4{mUY1{RnYnm`S`&1H`axuXO$*0D;3(R);p?RV2)(OnDO6x5g%#TjULNt0BsgX>d0mm1&%)C+-nKH8Z@TKMC+xL3P6d;b8~ zBILI%zh6_!AhPM=P!&oHzKzTF&6GD6Cn2mSJBTmdT+2+M)h>y?T%-6`aN2n``DIxG z>ubmM%;g(6p*}Z)ta*h?nE`v~iV8`EG3%=f{(h~ zyZnA-8$GZdC^b@NUlEkrg1o|xlf>q&dX^P}9)GKeP{Z(QDaGAjW(Y7Ya7jp(3gqhd=~V$v27+- z`EH_+PY!>7aOqD&3SLY6+|3!4d8J-^oD5qy5AsZ*0~@?0*H(uuzPR@dK~&c##+iAv zCC^jK{{SLz$H@BP6Y84>96g?93L`j&d&SBPQojggfv*G&LHtB5=DKqQr|}Yx151gg zlkG09$8iBP{$Z%_Uzc%E8(IZRXc*@>nE^@~iU_nA_W-IbvF8(a&|sp6Q@M_+0+_`f zG;8w)qZRI2gLdyP<`s^3bp9c$cJluK$Knl2JsbLz^RH05MvV|9iw&|lc;XsBy_|Tc z9qkPMVV6V18WCPK0H((x_~45u{}#dhuQtxHIZGnKfnN*b}SAxmakJ|o3B#QpyOa@GJ{8mr1y>N*I# z5$+P=r84FB4{#YZyMDWY?Rzs1T$u%yg&7E>%Rsxj`TuWyCa> zTU5vTE(X03D9|zsEy*xDuZZto3U`_F6jwjoECdnv<|4gEdViV4!vmsQc|tT2wAIFr zr^0uI_XU;N_>Iuph#O0Mu4Ck~svpMHUHPaQHg#|V&bNtz3Y@wkVR5D*SkJqR1(Xz5 z9@bJNRjRpz*M%u6VS9bo^&cM(N=_vlw;Bc&%QK(qTSr`C7zXQ6cht0_hF8Q~NG)|- z^T%eBZuWW4)TTRV4fimDms%Q$Sqg?I@qICpfO8dtWky5W zRQ^)cRYO8^;%J186n%bX;a40iwiDO~o1-5wE)#EHu1`H&OL5C1Wq+7U1lxHo&X^t) z7A*%K*$Qg<2HlPRYq?%^A)EemVtIq{Ke%3lTnArpdnQ`lIp=cwG*l>Y(=T%1uG;gs zq-w%rUvkrn8>{|I!A5pgXSTFKIaNI_rDM$I5BF0F+2rFT;A zkPd2szGd>wU6x8%Mio}#T53_(n}sF4n0ti*LWWISvF24ot)$7fhY_E=ghfFLiplc0}CrR%h`ZSqf=dxv;1)!yxAS8 z)J^AeHFr|Uk*P{^#vzg#seFg=`j}=hs;6(LEj)>7Xy|bQliu4;4-$gKrOkb&i4go& zE&2%f;}Z-41Qs;kCf+^ET4Bt|nUe zT&euj5~8Z0G24jXH4aSuc<}&vRYo=G=gdQ}9u&(QH-KrcTh#c#nEQLgDF`hO+lWw< zY`_nGAyon^UL97xU_!`Ymbl9>GuEi}a=%vWQ(R(ML;$2IUH7@3km$E?Kn&gC6pH4y z{vbQ$n}C1K#>$o(K4DORRxyuqjn@@Rxm)sqUD26K>|;L!+Bpzt8M3eTi2>Tyt`y`^ zM$jFLG3fp^0;_gc1B2A4+Zxc|{{Vc#%EGt@_Jk<|zdmXP3oHDaARDqgT3Kf_G8U_> zVM7(s3uFAuu_2dlE4(mAA;98PXdCwm*U3HHO-0j?Xl38R?qm*M8kPq)m>3i~fI&q* zrKLj1-zGnacF7m=7`O~vq)?+Gzs$|j{{Wft6N}TbqU2Sp!h_c}9w80=rLzVTmTT%@ zydlBxbudWT6taOjb1QJ&P_X{x;2@%zexT~a4ue%$v-p_w0bR+qoBYEWl9AsHPmPQN zi}3}nUO?(Mkewdo7P~xm0c2gyT=6xmXA}_)6|3;|HQ*Ynrzsqr5he;a#|blP_H}nF zfSm^?b^EF04NHO^s$&=Wfm(xrKaOHs8pS{ZIOY5UF^#rZ1{cOP9xH_0bbck80pY={ zJVc75wWv{{X;XSrEL}Fjcys#XQ%T8$#QsKCJka5DKwQiL2@z(y(dnFx@ms4qlt(&W;)olYC1UzlH~WK{W7vFQ6d@fs>V+46E~Us*~m zxBb9Yv)FzK%tp#6;KLUq70#~?W5c%3G1qg9?E`uh z9Dk~K>dG`af= zu3G6c$M}~vam10`D^M(IekisH&k@CQH6I4Jzv3u@ssI(r?2fhFoD3Z@!5CnjaWf(t zFn5@NF;-nQ$8v%NnC=8Vp;Qh>&i%sS0?O#~sKHH8!rSKImhSDoQzwRx&}L;KEdk@s z81a&@T_feYE3xpx5MhZ!=TUpxr>18dOKiEVi)CuKrOn#I2pH=BCA;S{Y4U4;Qo7J@-XUN z>p?mhgGJ{CdF}@Sj;~bJ!I^8;rA?Q@nUSJIGzZ8306)T0OVA~SrSZhtlxr~5rXfU1 zo{5_kOqGIIN+6U1`4&;oad}S)-m(dieg6Q6tBfw+!~%3=qTW4BHZ|N&k&@+YC=^^o zNcTll9HnjWWqVCJiDY@jYF^`cm8lqUry=f904?5KSz3Z9wBPdR)86Y&x{;mI;=wAH#T#8}R~%_QrcK>)($v zGM_tsq1x=1M?}pXR_2N3CBQODzY3YdGu?#=Qzgt2%H?{20dD*~#js&vrOHw^@06%4 z9lsL5)zP<^na2+&;EM>QX|()+wtPhFUBBJLHMUX8g*0IDDr3IAM%oPXRSg&Jd-V$$ z2@DH&xNr_2AIhUam0jXyzjH7}A9oPCt9p$Zr?)FBd*6tNFCQ}%i+B?Gk4(;u8H1pt z@++Sb^o^r+Rd8(unQx~ikw~rUc$B(#>;92ZG`D6T`_MCO#(?DG`5~0qEPiexy?I^S zp%mbliJTkS#-*6tUe*Bud(F200JsZngR$h6v|o-%gpqqq`-F$ZioAcxP-$snPVE#I zYrH|>d7&JyoZP0@0WCbPkgB+(5bZw-d6_C6nvUJ>xte448<-iF0RG}a$3+-;b9EBg zgV(O1X9c3(!%$6yU>#SO6J3kbCUoa;W}eViz9#K>KkqTj6v7pRAB{oswT@RBqIM=& z9%Nnj*UU+uekh!hzY9~QJ2`>E$ihQ~KkJG4R5;?lxSF>n!WHd?w9v=^gJmFetKN{* zopPY}Sz*j8WE}U*eKc7D05s?Q;#J`G%vVZ-D6kdz{n!&!92xtMCbo<|6vM_jRGCiT zH4a;X%GLJVwcut-W)*69E#hRA@XlNy9WbP+K)xVGwOYNe_c8*k+q#+E4(b|x-e6(L z{6SHFgl?M~#Aq)B-i1AXQt7kE#X4R%X3IT2!q`pnrr~XCIA#K=mr)i0*f%P0_-0q4 z@xV?@b%P0Toi$bi`>)Sq+&AJH28QJRD7jO9aN_va(MWa1-1;qIme(O z@r$k_E27HK^YB4CQ+WV_T81wxKkhOPlR= zFBc;`zBiT`fB;`DSWU9w#va*1&LA4&9Ml`UL{Q&c{%To)=IP$8!KE(=RokSFp2%d}{BQ%d>Zgd*)2KGg-AEjRi90FV|2lrQre%K`Aw zxoyhK)qWsq&8vEutQzGI0DwS$zs3t$1UrB|lIwFC%woZ{PmqPd0)S{u*GyedMb|D2 zL_tq>v1euVxQRx_t%cIlZZu3sA$qxnKH6mrM(~Onbz0$<*?mf8*Md-~ISu?ll(kg- zwLx8+5pw{>xAiHA^cKEh)f{`H1q*F1MngVkkk1`MtS=X>&4QQ2^c=u~;VB~{mb3Ra zGd!^w*6KJ9GRul6H{1UJk%HaXhu1`

)enJC4RY1fTVnC-rN==Hj|w8z%Oq0s86z zzLChTDa{@EjtgB7tgs&u2S#Fn@6BSC#a@5MH8Vx?74T=gI zHI~2Z8ew3yt9v&r)uvo0_LT#DEokMXf=~j0cz^a8oB2j-+wmRc8bGWL?r;>eVe8WX zFrWoT@`ddRmyWLY1)(5N<-L7DH0sWt3VhVLOlC5()#Kc|iq#Iy^~~6wM9;!1CfY!& z^UirALWwtKe%3VV{2_{1DcsvQySvg-fjAo@08^Y zMNRg~d%RG%{j|#c8K#xJmKd}=kgK82?bOPuufk~!(=gpKy2J4b=t@yjSnW_p@jP0% zG4U!sBnz|AVE`YritIy?uT$*=IHG88QzS`W%`EX*mxXsI_*%KLgOiNZrB?LD=kB|l zvvs4nfny8=uvn%HTqOf2q;0g6{z#Mo&2g_N#LOESd_H>It5OPEH`ftBDr5rupR#63I^^zDFJ?yB zH{aW|&dbHX#iRYojaCD~dB&pxJZV1lXCubcY?`Kg~$_Yro%?j(L3MRY566Fn5Tin?uA0p$Mxdzyb{<__)T z?jx{kp-DK5~K(qPO9TvIJ^%2kb7UGWP*EO>_%xo;a$KNk16nW__lV~`$MPt-=P zN2JSM;tOlGve(3-vf0K=sH1UG%{Hx);D`WmF?Zr8bH5Hq2E$6BuZS84397kJHM#)K zB97y#dgI$GZAhbnqhvvF>4shznJ}p{Z09}9Wm9o)wQ^j#hjv|@P|6|)f&T#9L`E7a zE9NY4I66KcPQeuP9w7!5j4$s|?ONiS^8i|h4-na;nOJUU(O;}_EIptU{lv>Z3~aly z7FQ~ee-k*0+CfLeMFn!>m>S~WO5$swRR`@etp%VtsN`QkSMTwec5{l~xKa=d^xh+F zvS2-!vM0~9!L z%%^og*i!F|aRHnxUT@Ad8p0jbcErvp+ViB=J|pc7w|ZQ1*iKi_Vj?2iZvOzka`{&C z{{W&X$Cxcnjv^YnUIgwauO&V=Ocf!eN)tIl`I{j&x%L7%R|2@d9^(&ag-82Sio*cg zuW)=08&PmLqVV84nS0KFLBJX=\P_$Zjkn;6`+fXiX`a;sWApze5Sdz1m~gWqf@5sa2Jzg?C1*R-!AK{XKs^hOW5oXeI*XLQ6B5}%f&{nCN(O{E4zm~M z?mx0~C?Qj@R2#7?51DwVSgrFuJCrO6c)P?VaLypDtT`sSTs|um4C7}}DV14lQE(<@ z8ucksIti$jc3}mw{{S0+C4#nJv&>a(rPXKZ;ZHgYO8#*+${5VQsP<`1HBj!4Qm_lXh=^Y@l#V(K|-qI zb5yL0+qejfiB87tL_A1@&p-BJJY^@iGY+Q=Eyh>3_0SUAy!)8Fp_d~ ztX`jk^DZ^PZ^ZZ<;wFSBVEcu3;K8U3SQ;K?T#<^Gk@CGnrv})Avu|0fOjgG2%n;En zl9xGRHSBShec}LBFSG__j!ZBdmuluN<*FvTdhS(|lRV3=YOjd+i^ig8GU%GwP;*nc zVG7kB5e)qdz$uF@DS#}cxbq8R?-I(aJlsJ#KMX`3TIH6L<|4tCCL$Kyc|cIyql5z$ zF*f;Q<^nv1sqp^h-d3#hb&8ipUl31Q~{+Ne}FZsCSr-n(?HiMS_nM|>rR<2R7bAjW3%moHC zmY#JT#i08jwr%!)aR}N(SYxSB0Ub^3#$}p1X|F0ejWW$}5N%zkY%6It#;5Ta46uKT z+(ZGwvbW8Uuw`?PA5w{s{2y~5&cDJCA!kQ(1Y;ar3m;@&0F5W%0k_Wnrbp~j)kyH; z{6JLAaE39_0#@PgUME+1pA%DB=<_j{wh<#i#067Iaz&Tt7530R?%etekOr z{{Yw-tZYK>o$N)doKU49;_gz5Q^tSfq9@!%vu_Nxa$XIU=Hqv@oxP)R$8fXVgj3J@=vTy<7Z~R3W#|}G<+s*2w;09p_OLyDJ~5S zEck{{+#=>W5IFweD_6_U>KO@Zo9+UrwXbAZOc&rvTMoy}*SGGtG04T0LftWbP&4r> z2Mji)?pq%aVQ!)v?x8BL&!!@^SXD<+EO~=-0Eo-776t)#E?1!e!t2G%rF~($>SRF`Ru5%j zIajd0rNmU>uWn@?O7ZV7{G*gRv=)V5zxfTiV5Q+Vu>z7B0~|xvsIq+=RNF;)YvCIE zmVu!Z!Ok}-;hlsh@bNc`uIZNt0rW#aFA;`w>O4Os<|fZL-ervYsxuev8{%D@ycr&D z0PM6JOWF;_1+M05FFk?GYnI15qH-^IMeJ&n_VF3>pjt{V2yS8sT3ZT*+xmvydu6&p zixCqcYx6K+Wf+uV(c-lNot}SD3wW*B2W+It%yz~6W+nchPGSn&;QB5g1J!}~{YNqh zhn)QX08u~yxU=P5Lm^5F?Dfnlrn0jZ`H5w~+~7h{uZTE?<=lLB5@n2~Fp04|BOju4_?V^cH}6U0?AH@Sc*o&j*|F6fidq zl3=%b%>>04SB$_g`AX~I&lNQ>hiFzZq1<>ut+8@X!F3y9(7A{RQ$J{D>S3FA@h;KP zz%zymSPc4LxotcUX4OJi7d%rRaaDOVwY~V2Cor9-&xw(=S8x#moH_c72>{9S4vq#g zOZ2mSOjJVTd+`C{$)ryJtInU8^?#fLekFu|A^JbK0d!u&>L8~xW8vLItChxo{g~)0 z2rLy19M{YdX{ctftX~l9k1NX&hwvX#>XqIqE@&aeJCt$_@^H$F5j1HgLCw|v;3y&m z>G^}@v*9ty!y$97ZAJQ)2eFL#?j~l&Lr49XY>y_``jj$5m7nfdX`9XDWh(2m9Uw+j zqCTZTap}`CrD|XiUed<}vypi5Jl>2d8Wo`hVadm%HSgR(z@sazN|vFS0()jJMC|bz z3qa;2BXgTv^oL z2fD|YkS`dv{xc#n^Q@;$n!{14+5gL7iIV|`BL2LGS%k$)D>tkVFg|aa59iuw?Fkj_8Mt_X-d92(wK7_Ye=_A z&9HO>p=gSYwweYZ){BDU#~OfGayRLcxUKn^wSfkLc!SCpD^T+&JQg?Zrf90GTxV3p z8eNFxpoe)2JuO9W|s&b zSc@TyY<^rr%cZK0FWhL>9IW`v$DS_MS6-uv8|_cjbsKqCUTQvd*tcN(%(yTpT6k*6 zdN$j(<~ATvfrT|N@J8$))%r&J%Po(Jjs24u9p7e{2EArO3M(_ii=2QAGZ>z`OoKM^ znnm8S!tDhelVY?G7Km1Nnw0>Kqhznjk7$S7#@4*!3|0|&44+U5Rg8&6X3QSpuottn z!M%d#n1O5Fr2;-3%P$K6$LPD72X=Dw zbu?R4(gk#m*pjTIVRvK-Buh9IF)?Gh4{$KSyoA~ZA1BOl17Pw003ki#Qc${ZGMdq| zp_nW2D(Vwp2Dl&ZGQja}swZv*{{Z3+hWEfmmgSG+u(5o_XFo2Y3#uIs;*_(7ydzb` zdE9lQ;VogFNrw^I97b%v^~cS_;{!|yxnpqQm`%2=0|WQ-5xG|*KQY=u+%hrpnIR>` zE&PdrvC}RL#C*(uBou)xpnE)jGnLbFmex$g5AIuVG7*(iC}`~i zs$Q78@i8dx?Vxil!Pe=pOIAfV+wYlh7P44G<$&Yu3Cw7F~#?8cOC-#z6TYPLgN&+ zWU0YjrQR8Kc$%0tjatTPG)wA`$in#ZF)0h!6&v#|3vtw244W;>v`1zwy(^=M#TdbF z{z`Q$4!q1ga=;I_@iKiIx_Ij6ElsMvlcGlrD!88oL&K@%AscI`T>CUazTr~TCFRxl zl)a_L+jx~QD5qd$5ZYh?*mw$wZhcUiLOG?%G+gs}ny++XGZP}!{{T=WrO|WhrEy>E zd&k6f0xmAs`-zfisjPQEzT>OZriOuEB47HBRi9ImDA~*i4C$jRQ)T9(0+zE{%TQ;4 z&ZWSkuebqU3(kizjjw9&GaDx@>IIdVBQM0mpx?axOp}7i&(|=(mu(6Hg~I~O-;=L0 zp}nyKhFDbRpgs0VUOFO=Z&Kn)p-p(GLNq$7QyDTO+s=4{-S}O{@+E09$pISx(=U(c z#GE?OYlu*!4A^cp&$=$hYQRf7M;0+SAu7LoABb4hmbc+G7^@D)EmuXyR464+MU{{Te0sbGkI5t?LOwUirWab-Q~4GU?7RV_mBRX<-6%_`b?V*8e; zv)r>n`k&Vk+7Xctf>l};3m*5M66qsr0{7f|Wk9!!6^{gRj@rLZ_u?e*8#}dsi0s-q zf3!oDNWiXl?3$nOKiYvBWL^dM{{Y!avzUkQg+2@2Da^583)!dQVg)!(e0wDnjnBs& zqhLzHEOcqRSw5qeP2}d+sduuOv1w}Xbp;`vAOV(K#(9|SDrA7g^w>TnITbM+@q0z6 zvc02-?z)0LD95-6p~|Y;A7?`2uBJ-YgQ8)KVv2qx2l2~uJI5^M;ZrGxWy}T(6`+-= zU{kLs&9fpp7zUl1!5u}5jZoB1O{t{|>QGoJn?9XG3?)sbe`517-sQ-cM~RTJ(}Wsf zg_I4Es7{%O$82yZ$Na}|1RD)YsZv8l@KMY7jT#sWgUa45BUT-{uQNkgmA1S>^=VLI z#wvmjSMdZ$X;iu#o}qRusrsAFZNJP-0p@1qju?EiB9UrB)++-+Roy^< zavIMvfyHEQSMDoR*EvRR9jJP&mb0%ZWq)$b3C*cb^$}v;$_D=c>@8jf-_gut-MlOw zpviBnjs*3*vD>yNGR#mb;yoDg4Qd(TZx}vN7M7A8kC6}49^f4PgNgUk4s4zk@}iM>jULf&Q{MXJ7NbpAPh63fBQ69U&faRU{lUq0fQ zJhUXhc)YzrE(ZfJohL-c!G{!?h)}U}^$}5Mp?yJa1ZhHPJ_4oDwhF}5^J=E+Ge+KH zq%%{$N5u5JF#LXEtS}VOIE!gU+U4b!NZny;-_*s3(-amKf%}+MLR@FRDP{}=3xvz; zSBdg_VTrLue<_B9N}k+gha`st4h$8nQj`0i-*xcO|3D0B2S+8BI+a ze&eW3BUhKqv*bko0MZoz^eB4sE59m2Ty+F#def)O$jZx$E5VHUl^_8Pi_%U8aN>S> ziV!BK;nc#|z~xfw6lHwcR+VD!AMX$jM1DS@0^Jz)X^7toG#qiQOSS-R$<|?xn_q9Z z2;~b%AR z*ghfE>J8a*RcD_)K;4)qZ>Piq1-VuZDIioU#eSou#Noc+RzNL(rs3$6&Ng;VNWk7> z4`9YhWxFS!!SDNnQ91&$<>>0%)yR=!7Ny5v17N~{25w@Y12YRaKnnxE}We1|bwSyu?u zE|QyosR}wdjXG7LjovdIj&wUbF)G1-4^pfIc7|}vfUkjdVuT0vGX<_nY9w!Rd9#$i>z!1 z@Ff|UVbsbDmD&BkBnF?&SwySa-~E=M;lSE3WutAMgysl0Y8L%O1+DAwO{W!Pz*i)+ zDZaEX`I%*B6lHsTK#1vO-5(P2Kr1Pv95A{VA!S2s+s0**?>w-}W>v0%#m*Qli`v{O zP+{9|!wPU07Ml=Xqw9$3lykfP035L? zNXc^l0G0Zg%NFZ{=frTRjtU*cGJM$W^E@R4`d%W>HI<*S8opPUj6#VA!K@RTR$PQf1ORcTC>irX|@-I;3(IbQPzK{k<-!Zb0UkUZ#4l^m7Uv9F~e26b&Sb%>ikCDdlhp2qCljf z9jopXMJnlEArTQu_FXn+U%ZX9zC9o=*-q@Y4l9zc!M}gZr8&41;l7@uB$dBpBUk|7 z)$C(frB55@@hoDpvbI~v8oJn~mF+ScV_Wbi>Smm2*p3>%dj9~)W?Zryvj>twEN_8% zIhH|-w8)lRUmxObY%87IcmoCJ@h+PyL6Xm)W8ayJ0QpA8H>!v`aNXWkC4jZK)X?ST zZH0HJ#%gn1L7LuSk?v%vbx>R}dx-r$=Hn+ys33vMaH=#;M|qT}w!T2|Gv!j{rSVR_ zBHFZgwln&RymrILftmBY3|OoU)vlqPEBttuP&31WwCY&7Yg7-!0&u*Fct5mKebt3s zJM{{}@%Wt-4>N>aMYfBp%|S=>eX{FsOtvkmmKyV(;3BL^SGB0&HV&#c0nT7tA>gTe zHPE5fQ!q9{RKLsA<|`LW`&@ZX!8F6o0*!enkb5lYlM2_#Xcnf zxR~XA^$=>+YWM3>r9)^sqlm$a(+pUss*eW)#Y`@#vr@%dmgKbyoPqw(BXk{}p@q8U z$A^hmsbSvtC?HYg=hQ$P2rJJ#++Q&oZn%p4{ELfu{IMKR6O8`=Z&I`_HrdhfFM4>T z@W1L^Lp6b_+vmh_G96tV`yllLSxaGHPTNNR+FvJDX%2_xlYaJ&9w5+hTc37u}`IYODcK6h-z^(`8 zZ{SOcmX^w%i01=7IgK3+`GyQ&MuwBeaj$1Mg1W8l--OA;a@5%5{{Yy7G`8ZT(l#&d z66OWrPGJjGIokcqSqn7t6%CQs%1>yi$H3uONp!Y5XY`#m~aW);mZH?Qq zT~@AITDI!YHqrc+z{GQbf=pXO#Oh_`R?3aXVJ3-t-GOyCEz+$yLy zjR4&`Ht!V$XVJ;&x1wN>R~BB=m^G}5Y^W9$eoFoum7Idutr(46qXL=SyjXeyM989% z&(|`=9v!`Tm9xaK*ms}eS8TUr&l%(jj*A0D(r=t8c6fy`VC=J#{7iy%cLLcLsK6ZF zKXWBP4nyDkl^`ej^0foI0A{cG?iKa&;a1;$N(}|Kr%>?PiKo}pQnjtONZ9NvgUb=z z(ZP7?WVbIaE7WXM56M$>SD9iqlgR&u3SU1^4f_}yum{M05dhg$S(iq=CAh=ey6c0TXkOtxoQp^3iyg0 zg`qXN9bZHTNIDL?fM33J^HV1VYK+U$jsiYOSq?@4cx(BE>^4_Q`}mjw9G$m(9?{U+ zE-bn((ffj_S4RH;si44MbEddOvoUbNT^&H?7*G~hy^*0@Fzj95=3ru`SCz4tW$tP- zL5xMg;(!OoGO3&j*X7~?PjY44W#Sx_{7ji?sGtr#%PdOYH>eYVO{%AZa6w^(4|n2L z%sHM*1v*XTQ;{_1e-QyJr^tqiBWEazx1nnKGKoNv`Ae+65%FBhyWC>^#xDYbDJY{$ zKZwL;3svB8({a6IoIjQBQm{EzkB{}oZsKGW{{SF3;P9dU0F#}o5q;Dop|ZEZj>e^z zgXz>c4&#&#V)!mEEL#hN0?CbY4F3QzJ2B6X+{VM&%Zs^U)oX!!vH=GA@&sB!fZ3_C zquHoll{vUx4M-DlScZ{Gc`i7@o76Rv2Qvd1!!{*6ORf!KZ)pHB)X8!@riI(mfVukRj@q8v#{v8^32v%uEeEQb<((m)wqWp zlG{)_9%A*1?(#j7rJfP{5Tce=;9rO;Rl)FyC@z@(9UVbR5n z?fgayl;Qe=j9G7w7K}lo5*UJvu@}}CmirCCK{<+aGu{uU0&V) z07!l@+O7S?Z$`IptZmH@)Q14w@5EO&>hX6@E_ELTtn>c>BdE@4g7I@QuK}a2!>Pe` z)_mquvK%PnJ|R*DFuU_9Dxk9lu27+Y(>6kC$QZi{??dx`n=`?ZKh*@cEhZxn`TVAl6Le{6NW3Vf-#?!Uor@I$?on zGanmR%dS;q9wqpcbV7gSgdO-FT#Ug3xo9<>+fUZ45 z$RUH~pc;yyZ?HzsK&YHW3ryTbv|-N>vb0iz0BWCcii+Vz5VUX9DMr`Nn5mddi*^0# zcT-uw{-4CTOOy1Q{^CN!Z&T~I5V|5e`DPYVwDayNas_)mK&5Su{qs=(36GZL^-u~@ z=En!WGZ#drHlGkEs0C%k`%J>dPN&8tDEBf=*}JKY*awC>j1JC~QuD%b07P=^K4qLf zrmi>!rfgZ}Ik}CcyXOSiRIQ|?)G9H2-v0oo$2m(f{Y&sl;J>J$O=oZQN5LYZr-^U_ z8VN(FtK-0R@e=S=Mhstwp;8g&A}CjjLr;i}Go%wIS7Y-k7HzPRUUMp{au8Di#4d$B zJ))boP7e?sMM`@)x`!ti>YSm1)M1(*hT*i*sH0d`0rl{+-_*sSzF+LcO0+ny)U%O` zqRDe_A*f(bmaW{-bXt!_xWA|!3n!oT1!Y{|>G3VrLCNb#>n9ZmYFkHPPzav8^ z?JrsGGq_^)Ow)R0iu4*lzz04fsifkZ50V0<;j{9R?WesSRN<&r2BvCnWLTlLaZ4dL zP!l*Vv-2F3dFg1WNr~tWm=5BLqrT6?xS>9G1(X*`e-of`9cC9{(&`1b03gKt_+>ShGc2-jUV0>es}S9^xn z%zQtn^p$R)HQTQcLGW+^KgZmwu1ENEPp4rHY4LKj0ubnW{{XW3jejNrP;f|yvMLeK&Yx3$@xlu6%c6`o3`Eq|tc!Z64&2h&|DUEX6 zh{4rnUAhAXJTDQNeJjsxe&D>WG(R$ccSKaMKRz@60IW=!Xd*fc+#Kvz)xd+!y?DG! z8*Y_-<){+~QQ-&X1qSM#%FZRrO@V9j9(s??v3J@CErD6iFyqt~YVX7|MmS-JKxvC^ zZzPsx4)fx|QffXhO8-#N7eD8r^O==_#4vuNjye(c>DzRwfE)Ztsel zR7L=p&iADA8%;l>qpqhJ3|9@0a_3OwUllB{S%9(lnToK%gY~$4j25fRBNMX26WDU& z_)EIYpkrS#^#!ngkm|1n@t;Uk4njEQ>H;d(5o^t7?f{0Y3m$v*1ZdX&a@YFhv@6uB zPt%3~3mkCKaC+t#f-KP@bcR_o?2O^s)J}Oc{!YQ2DQ*s#4U3$HdYYphdWr~+r zqS8{7t_LrPeX&fx#!{t}U&a}xIp2cYWwcQ=C& zy`NvyD^j@z2OIUp`GG-4RS8}4WcZ2ryXbBe8=%Tha32WL0@DL#Q;Oh zU@97ghjPanLwV1y5%UbxzJ^S*^mqyv6eMG*UC~;G1N##?CA}1EtB%GWhLOTsaUBr9vrP{euxL+81+k-+^cFiQp9l=|av1Yb2<{6bM6tfk%? znVOm!9y&*^fo!YRT$48rpE+TjM&0Q!XDIC>%mP;y@SLw1i1mQo&2&7*#i(pAI@BGu z2NmZNAvZ!d^K+abL+JcPN1h8;7&csGjXNj=zD!Fj8*YPx#Z)02y{tJeSsvlyGFirh z$^6H10#RH(brBUt3VYleR{IIu7uc=Ge=r;ei}9WzV%dub;C1FDu|Z3Rj||4LF~S*( z>uuz?tSVR4j9*N&HQUhKriS65B{?o?T*ULGE*tAd^YQSW(w^#_7=mB zxIRF}&+ZG4o(KG$B!bJKo|eMeimb6munmQ#KA zC~SFbd6*671<#1VHZsrzZFz7~rWk18T7rRU?&sXR1%Nc+32zsLm7C3KUy<)BT657= zDdHnSZuImz3y|QDZ*~UE;@z#Ngo@zNbAlV8ZT*WYjQR9 zH9#9ovF{{tsWi)9oU>~#93`Y?SanfH6K|NQx|meSjV?7fezw@{rZQ58hjQ26 z#5dAE3y)RH*4lb$1zOR~Yw95;qh{4#USUneuHEiXMub~W&!`2Pfn69)<>ED}My-BI zjN!2J8twPE6Ta6B23GjEE%8f~?d4$tmeWgLUBhGvi?4+HmhWIj=h@82X;d_I(;Bk{ z+iwN^TtwjM{{X3;QdHI%);};T#Rkoy5n0l2!xDxVnma{s%5n)tTKcz4042ZAY=H#bOiK zMJarqPy*JWHK;6k1x^ToT;}Cx9a&ZO@^J@WsKj$qLk|s)2Xz^hXJZ5SU!s_L3 zFu@UmwpQ3Hm697yeqaqW@g8fKhfFJ)9EYwTWdiHth&|R{{3F$8hMwSyk44kw7Oidl zqaGAxr%#DWB^7MZ8H=ULe?&!L7b;~2hnJ5Kn;_Gy#UN%eYvq{Y)c1w(OPSD&Y2f?R zYm}ydYxjty%#0!azle((2eY8&ZwZdJxlJaL$P zQJK)}8X=)JP6xZGeidUk;Zn5~W$3x2@hqh5eye|yU_TraZNYMYb>Uv0sZ9d4e>oFX zHV1XmT9<@?+lJja!hbO&TV$o2=4kLiQuf;@dM=$uTaTp>EFXBJtFrx)8t>ew^(xs{ zRK?15_aoKm8JrL%?%qt|&gUhm$5)m4fGDvP{K-TF_(mNKw=7r+IW9+?%8C_`fI8Mu zFAkp{#IGMCyIPHwHdZ0xEW*|xQrsD{qEH1`2-)8#`)eV=M{hF(qh1J5my1pa-0&8) z=yH~W=ZxH~tBe|n1=9%e$NHkFao%SR>xp_xRrF5SZDLVMbAyj@2@Jx!!yHUMd9bt8 zw4!-7`-$XhihLRBZXp0wO{b3xU9`?*3Jzss@3}y1+7!rzn*qA`ml;XnAeop#@=|=U4`PJ=`o|C;064Vp_?al?7k;wu;vlN9 z1PAA|Zy;loKZm(_kXCES|zqRYcM5V%4Is6LGQ61RBxGND_pm{lp{{RgX@#Y2%gvZVR zR(XV3&I;aKkaCy-gH_jJ=pEv&ilE$mW@$`fymBjK!t1tcgu8t@m&cCL zhFJ20L&uwxbYp0R-=^X$&^v~_{lw9?TKpgG;Y4~hWMA{qGK=Df#QgsNQvi9oy8i%N zQF}1m`Dc%0+<}Sw-x9&4YqfEiYIaK(JuloM+!yS+Y2$i=oW3AGQLJ-dY&CH}$tcs$ zjmGLz0Bp~l%0K`L?dE96S3Vq%6&D}}jdvSBby(=;rOhpIVCw$>R~D{@qN`Vn%x06~ z`WANp0WB>X^N3o&7&kW30Q?fMYAL0Dw~3rEPE5<8(7-f%F#DEMq$v1#`J4DPPG1u2 zA2A!NR~cURB~~cwnMJ&#{rW;+Z~<5B@Xl`n@lNzH)TQ7j51-JOSl|=KSZ$pMfuQt} zzzEoGTKBdOQmXK@FJ5A;4a#Z{Px~^UP9|3$$_BMgXr|QUeNAR0np=4_cz|rhSA(gc ztpxgqM;1E@!JoL{V+s}G_<;7)?Fd4Y=2RA#f;mdzG+-9N<2gKP|yUmhV=eNvjPco}MWfhrznM~hrx@!}SH*dlYRYEasisy1f5 zPwm1t^8k_B6un@}?kOT#g0073+S|mRyAofIT^A6X9G{Yk%V@# z_*nj+>5ag*_qY^-ro(w#@f5o}jTw|k#+HT>TICIdze2kvt_sm zc8?S?BOdvfsUu8=F!3CU)oc6T)WtooSNVrkO{T)~rx3h~7Mv9v30mytZ}gSDL;bDG zg&L_FbXWB$jPMOl*~j8LY@kYZ+`JnSsB?hnk8NCg4|u=!W*`F4m+(RC;r{?mW++Rw z*VGmIX~3;qMw4)qKfe$SD5T`&R7|v}Sp|l%8O&DdYcIG}^XqjVJ;b%qUZq&1&1LPC z#IzvcuX3bUFx~DvK_J4~>zSAs0I6#^<{Asas6M%fh%?4|lqxU{xl`k*b#X~4)P;MR zepHxs@M&Gl$0m%Y^Yaq85jfF($Kdz7&b3g3(bdVwokjq}9Co2x@_BsHdQZ7RjkER`kb-a=S0t zUBhD44CKgpuhFSygL$R|8ghDoNp5nuqrFB;?8OTXx~MvV?{&pN5=(tQw8;kPDqU&4 zN~JN0_gvuw-Zkn9blEifLD}V7q+>Z-HvqKbYM^KG!m}Ir0vg~x&l4Uj6hDt}ii=${ z+*a%hr~Vm(a<>B?zTq|K*6)vSS{8L;2sWs*9Unw~yL?v9gP5#TQ@PgM6U2hbEH1uf zMUnu@u>SycD0OtT8K!C)Zfhg1$$zY>8;CK`~kEOWYX9uRNM zf9_@`0=RAOiBgdpaeKaT1Z%qeoiV6yxI;3yDrE%U!Zoe!wqIHJYs_0p+e~X6!6jOf z#@zg4hzgVr9NxM2I27r)QLNQU_U^u6E&b1qk8$(Jb`OnwYGANW8^6XbUa%-IX~kf~ zBJHxUcYEWBYta!{0&Tv2W_zCv3;zHQG0Gwci+`;ALtew}QTw<-*Wpt1RYc2m{FW!gXJG;PR|;n!yk0EW3R-aSP9bW#r~ms@vt~=yN$~XFa5KL zhBEBcJ=Mz?T)-`3a=nSFH(WrjACUEM$EifIUMjOReY*4f-1&ti-m*ebOCe7%0BEzT zms&7umCQB*lx%X$!B>5sZA*}6pwqhUQDZ9Y{8Y63Pa%7F&3J`E*8J``)LnqaXx)3O zn2MkC3RC9RX}RhRO=Z{V&66-l?^K{(ILEasP@G-Cn10}BL zHwOhLxbJ&goPfupzJ8+(n%G(Ih*~3{Dt5qsQM?UWZ`;B{;eyckCMLj7m3ucbL>VWs z3d_Rdv&R3~|jAW%0JL07zYsiut8!|7^j2EV{9)1%VIlqba znc{!6Mz(Z-O^KE$hUc&xKGTyBj*rN~3f#lRmlNq*vJ1e*W>{4O^w?qidfiu?Lsgp& z9IpQWiJl_hGUTS9O51l&ztpWxM%OM3aR>=;OTzPY0ja@d%SRH-=s(}odyS~d2hO3f zJ7jh%hf=uFP~RqHMIvKQ)(h+8==zPYj;U2BgW+6G>w1)OlF>oDYFjKJH(U>{AXqHx z9Q>JyvQYX;03Jwia53KAJBHj3&8+-Ehy)U>vD3_Hf~kA@l@kSdo}s;5Ay1@oSU`*^ zfgX`=qxKTN%*E~kz<4>=<^&6XD%S7cs8yF4wI7Hy^DsEpYQHe9%U4br zK)@QY=25_1pOiGzt!}HI%u9mxPLq;&rx}Xc$8LnJK*Bp^h2)uLwNyu^Al+tMBqZLb ztxgDEJZHo=HkO4)4pUL{xCcG0E9H(L_n=3VYIQ+d-0l>FJJ4{1TsW=WrVmgKirNeN0wf8va5xSgi^-d4ZLFQJtN6+)>81yb};? z3`fXzEx+Pe#Mw40yhP3SVYpTW(ra&+;A^+*W%0NJQeHFbh0d%+?D?H}%)7$2!Dhmp zBlwy1rlVI4@YN>}pw!C)!}vg;xm@u!U<*pVri=s%QO^2_04{8pmo&PDd5C2Q5zg~p zh-G?gWsO4A$`*Nsd75Aher1aqUq}6@lqNO+e=S2$mK4Ex-kM*jRi!Jfr5cH5x6m*C zCPKP_l!BVqJcsM67q6X#NmaCboxspQskm3(@&@$H0?ePVIoglosX9XHwY? zP?~uE01%q!!!Q=`*~iSXDNLRmN(HsT=HcG60eSCnoeWdYQkn}Km4~>7w}%P`_JNz& ztnGP+4eFL*^y0l#>Y)1gr<>9@#V{*dl)R!{2ew(7X;BkCi4e0479fUyh-TD856J`bfr!))R5%>g+ag>|kpi`YF;(JF z{{XDq51|P&jaA&D8`8R6L>pL17M%>SE+r%9F|c44$V|{K4I6M#3zd!VcySIbeI;Y4 zIHd5Un0!LGyeO6kIS;^;?0aeP93#dLq;<=&gM;mK!U)F5LI5rp2-?TJ%9Tk1pPnMoQ#8~buZW_E?P{C#z(hM z_GpF|Y~$}Rgure~E%N-vQ9ux;Uof(d18_h};FyZ716&2S8G`&Z3vTO!spbA<(ym+i zXN8zL5c6;Rh}m7)d37;WaM&>+;;N#xQmoQ=xu$s?w#po%N~PluaMe2S zxhsWxgX^%#_U57%+>5!=Y%-fe;x?CnLZQ=7{KVE$3||MRRxex=Z*XU&(MNvfCWcQ? zn}xj2Z~du3P}||*g7O<^_0DCsEZ~Qu*0}p6u*|$aa+}dYXKu-WCy0L2#8O4Z9cPCZ z8v$)tQP>T^0LvT~4aF2ID4&51p?1NGl(6IC3>3$))qgQs5IDA{Hz7hJ4CBWf7cOs z`H&ZbcyY82j3S0;RwxkD7^eRK5n9dFu#E>RvLtfl+xg}>qTsEZ`W1p3Va?u0rrg4e zv7+BMdZ@cQ1BXiQ<{)V6GWz{Z6t<+TKg>{$otrT~0G@l_Qkn>k3@j|P){NAuuqLhK2|-k-ipOx;zU;L_fqhzeWHs_KS1#UE6ysuFzDdH7}9@q-9DmxqXxgsP+avN%%WFnsSKY? z{-%)Nlzq+F3pC2OFwW3OuOrmIaLg;%q`}t3ul6wKiK9_bOL8OBFnT*Q*WA3{jZg70 zgQ2NBCo_<37xems#0zSiO?Y4vWHc=G=y!cxOQwdr65ok(f+o18__%;5a%sO&ZE?aD z7b>BUEN(gtm#Wq!rQY%_%6CHDKd5;2gBo7?(7SaiT_{Yx`-oNJz`Ros2zK7Sdz{EH zj$pL9{$+=_VVtF~3%_g#1^}zSFNxi>L|h9U7yc3D8%JmSl#G$Atd0JLD;}d)Cb>8M z#Ky5Q%JT|Fn8(-VB1-MsN7r*Ua|LtvvgJ_~0nMSPh7hd2$NtKM?g1Y^o}-KC870b6 ztSzU`y-PhDJAN?Pi)D-&c_OhZft*C955f9?b$J(_B35^9t>Pt% zoFnF$i$;#J`{p+e)B0Xxf#42h>;91Qljftehsb6T_MQgV3->=TB>pB~Z*Fdv-Lolp zQjuh(XhwNg<|_C1a+=f(ig_+0zlnnb-NEKmilB@k!z zgj$&_-&^6uL1RXj#It9Vwoi$cxK~&!b-4=iP0E7r z*_=Vp=(;_z7)M?M!=?hMrCqvzxM;0j2f+ZP@P<96iwiTQ_=>fwS8C6g!-mGz%|f?1 zela;M?UC^^`smBxdV?@WZyi)Fz~`!H>TY0TP7R)Xz?^3wWcg*5{B~2sst)x|>-iv+ zO>{F)Z0=A@lAj-_nG174w&2NSW5Xf;042*K1C#vq2VEC7JdJKDiUGeK6}jAIg!KNo zfcKpPA*^J{cNij>LdoxzUzMC~JpI8!E>^EW82~JY4lQ6KHG=SUh()prm4AqQn>$z{ z>>Ngi@0sjCTuLh8N^PD_SknPw>D`S>sd5~DF5+3%`;ko`&BE(wK$}uBs#|+}&nOql z7C|vyDk!tTGRz^=)~|+FH|MruHp$4d@i_<7to!{&n^i;D!EW_~%EF&J(;F)aw?}b} zxaC-4wO3VVgk~}-m?&5LL1=jBeWn!p7X=O{U`Z&pbAK=;#I$&4Z@Eha)%0^6ZiO(X zEMG{efM}ox+0zZu*(pOZ<+>4rgJ^v{%XI8kIA;5b_Vf%l#yEr0(=yg!08+~Zs1VZe z`{WNcmv z@aFT(w4q}=#r|hG5|vO^U(7-5`v9S^=c&$7(2JaZyPGnKKf^VSyR+o{%5;F_3%vd( zz>+7wGPG6zrQ@RphbeY3nRP*d7VGL#NSc}S_bN#-Yc6_}1!uC^=Mw{z0*gwza%HqT zZp**T!wqSjVK~GgUZTl*oqzevCa$J zrW#f)Lh`6_?Wpp6Reocs78d0g$>6++>O7af1%d-`#_hC4xCX3IJv=}aRj&563DAc< z9}taMF7GiBA#L%N&l7G;Bo$5!Tyqkl?v7#mwDG)iFpR6q6|>@}5jZ?81FyM9u;5ST zKK$(4JPa_n)L0B;DX~brxv7JS$wHVxfE~a$3+M&+jTm-daJ;cNNReIFK=7$kq0o-U!>#8;CyO@r!w8PEuHra039b;1a zE*zX+5TNDZ@UHyDDIj9UP}Yp>we|M`j;6HD zt0i-L@k}#jSWz8w0#k{A`tvSm5#X`B%2I-JGR0z5;N?moz;CQi^yx#nW(i2DvA^}q z6zuc!JU=rSYi?Zb&LvvH(_hLZ)t*M4Z@JLPTs}>n;V8Z2;Oq4;qiwCK?)dc;Y{o&O z<^(C%Hh;+W0p9-r5nH6Es6$b`u`Z>0TV=(dS#3s~wF+8d%+#U|=sp(aMpc51jW{>m z?q-BTE`_q#6XYvouz?jCR~6L52SaMmsoDdP&zWF7K8QWUVN**qoy5AWwERQ%6;8~b z%qAP=xreo{$>=@6#gGk#F)`ASBa9e6Kg->APeR0{$*vw z#>91AWn2PqJ-kc`(FL=(6bNf;2e`g!F^(Ddb18CwFh2%di*}%=`x5s>Y!0&(DXn4* z2V)tqeE$Fw7f9OqrXQ1XXUq-YcPak>8H&7FTW^kPB@C5Zrg`%Nl~t;ux^)r=B5fCe zVaQ^}egk7Iz61{$_bNgq{Ac|}GvafKZ;6dW#VN+xODaXL`?q=W%*?7#bj%UlSQk?pz zrZ2bxSO7!^Dmi08O{)g=8Y(Mtm(*M~E{EjnqE|Vf!0zuO3udN9FwucoQ{hp;h-LDA z;A<+Z@~*QhlwwYNGR~C6;R`UQH5fxrLbSeS)d_nKxpWxkB45kQ&gm?)r5lM!q<}C> zJV9fM3|zoARA_FYU!|1!dmxWJTt!?Us{3Z;k52&b5aLG0zT1{-0q(r`mB(eoYjUf| z59~@45qcc@&C4+{!49B73geUq85!5JP^D?0^TYFsreo;3s6OSW!Pi2bUb^C3~z%q?qP`A zMV?w^+f*#Id}37B#+CCKa4ko|oy0Px)A$a3!Tyia8?fHMADEf5Q|WuSs>2W9U+@+QJjk$>&nL{-Uq zhraF?= zA0$nt80Eq!F+g7G9#AZePCB`fxxmN1;E*7R7(v%Uly;SI@d&gyqqF+)D<6;2x#f`|HF?1+6%M)1B1kvQiu`IFUh3 zDb7FE<%$j;Ry|DgE~q#5%`;a=%*+%ozuiX=Y2){ZGy{FNfBO<7&J8nJ?sC#uqw>M~ zxG-ZLW}wvQd&Np^UJAaRCh%x)4a>C*UE<4*W1*3!G$*HBj>Rx^W& z@Aocf*EItB^C^UF)1vrTO{&};+JSN?V7;|ih{eD(Uau=3?zqcuFE9O$!+TdUZ#B%q zm~79WoPJ~3!C}hl=2bJ43GicBY*71S`ir^NAhwImK)Y~g;m29y<^t1IIdn0V#$Ph; zjmwf#xmNh@Q-;kOS%&6kFTRKoP06YL@e!Z}bO)3Amvfwd@o@5}PpmMchpA@BhG0!8 zaRGR!7Y4^+`CZHOjj^x&M69(eaaXSHc3ZP z;E|NiNV3>QlXANt(cBsyY&7!%%u|w|XUwNXirhXXDuakl8IM))i2ne|ZuD_d9DKl2 z!+p7P0V2;i`t>s*vtkJLLaqeT_3aHSwN|v^QUPc}&O3wl_IM>K@|k~9@X|OquIF|J zR&o8zc@eygEbEk7;M_-;y#D~1CSg6cWBtVD8v)nHQndUYlzELo3LD`RrJ+=e$~y&W zqvqoh1X*toxZI=Myt7rglDDckjl4jBGRc_6%RfN$!`z^37`DCNsh&^f4(sXr-5`+x zPE=uy6x0p^_7|@(wKc5>?B7|riVQSUYLsf)2aGhZYqu{@EZ?hbUIku>R$naENibat%Zp0x$UW6 zgsIEnT>L>jm=t?rcOLd%w{YmvbLZFbP<2H+anHoIx5007{KBj#rj1@S+;+8CEa!6Q z0}uhgeqfCyql&oxc#jET!FT7Flq~x;Uu-#0EO0;a*xcTeHhbn~C>shr2^*F`rjPp& zVOys?{{RszD{m)~7^hz`>kBOV{{ZELvM>Hl8bF+wj?m4G@TMUW+S|WS z9d!$m&QtxkjZyq9L;!1TRSa{b$Cke4m})Bl6$0?B`>tkdV`NCM=AcIYIE`z>Vg90p zLZU0`6ANIeqqN$o&X;|%lokuQ`-zIG(~^X^v@BIhRyr#%Ygngc=b6q0G@zIoYjwZO z%h{W8T4B1v4tUO0ujva~hMKv(!1Q*ojzH|d{{Xieis3e2@jMMLckUD(*`aI3;B<~Z zjTWmak&OF-4RxXF1eT%I_fe%Up$fXfV8?MjWv+?$jSzOqN@;HAXjwcsU!ErL95gSQ z^ul$+ctgW70wV8#;RLU#Y~5~_0QiPY7gI0ya)h)cy>a3@HwKET&p+?D9|l7ll7YxN zE)Hhe3SRh#H|bU)f1{QQs-7El{{XX`*mgMYxmeJKi)dYb$i1nCwd2l6XJ?#PH3pYz z6Zzhch;uq|%;EmXK37X`Loh@xnz6@UH7X&t#@!vl+ib+<-;anZE=rs5UzuZWx_0j; zaixO2Z|B3ruw+qg=<(tjI(M*f{l-@nS(rjwTeFMm2rNYy4VVp-kIE?>>tU}XB->T# z9eE(!xK~W`gKrap=d>ts0h)&8j0+|!>VHuMVI9N$)Uigr9v&au$J8_?kK!DaHN!Q` zz>Zdx%t#C^2H1U^aS;7mG+W~MnDSRkWk2MkSt@Dyl_jqDA8}Q-%t>GhUd}b*SHR}m z$_hfd)t@g15kPn4y&c56ddpG8`HxsvZ}#RiPsk}a5v>B_VP2(m&$&7#Xc4+`{{Ul< zFwTwNUS`5TFBe|mLEi-{&C14DyI=gk-c_gimQbx3Q~kFXC3I%yy7{F5{n0Z0x&R``E4fSIidWh*|;>^4qVgf}|UXKn2JBZ6z zxPCwE7G;G@N9r4B0n{(g_?9a+%U^;l{Ar{wP5x#M3UMrPo%dlfWD6?#^Tfz{MEzbq zVlI!!55R#bt2Ra7{u0FEln{rYU0gEuBwE z+5l%Ut_UNU`M_5U!=N<*2)bhUgrz=da44D3{6VFY=BKBKqR_r`s0bhyU{|lqR>&P! zCr~+ISfYpKF?e4BpuN3HHh|r0{{SY(w}}NXiD5C+No7@_LOMrqZ9lUr0+mV4R^0-Q zn2fw4()TqW%H93M63mC}!8LYZ0xCoe8Mmx$SFrk*JRz1QU_*VE^9c}eZ7$>>Tc8dRl}f^}E%4~|0K6EpjCY*DN}8boHg)AJJscLr)BfTl z5xZ~;j~K^M^jQmX`SG}2Hf-fwUlVA!EEsF%=4xJM;Kkg9f84Oi@d}SWak{3)Ym4y> z0+L}UUcF0+-g+{`S-Zfo?mbQMZFGFx8Xt6l`RWyQI)(dXolN|b`I{y%DEfN$FhvTy zm909J6Fb}vYWeN~hujh{0*=#*{e8_U2{InPhFxnyEqTX}_F}OqR(@iRl~RKkiR}Z+ zQp7L|<=@l@jTGho09C}QFGsk&mPJ4ASTGni!tFw8UM$1ZM>N8l{{YxskZtCnQj{1m z8L6sZ@6s$>84l)G>RSt6vQ(H?$ngvY?64tDMS+!b!MtGq0ElVws*;ZSm5P@?_>?(@ z=&^mw8ye*07bUE&5BwoEJ2JKN_<*#JZ*B0$5wT)g70jbeqSV)!K3`$~vK+g^MTbt-W4uH|uXmN1{m8h zfY^bA2055mhm6TE8!j5IW>`Y7)7;Wn({}rr2247BC4p|#HI_!oW-r?|I8ZqI(V69t zDuAy1uzV+w{ z{;5W3$rSm&G2W8OZr-9MaPV`4eZXW33$@QsJTw$WguEoI0}v6R$(+n)Nv3PR`zyxV zaiQy$Ss8JQABn##4Et8M>L)|gvdiXtTtcSfq4~kC<3M9o z+wCcS9DJ;-dk>rdEQRzlngN{2UM* zRf``A>QkTu-ddah5PL%4PVL%x^AST}3;zJJrAkxHl8`Kaj*k)H(#|+9a<>mBW;>K2 zvL9w<10XL7HOwmZ63sW_;EGDr;kh zbytFC<_VIP^-ykKD;ET57N-9I^&buDsJX}9Mspt6W$JSvwt383Kz7+Hg^W`~-MlQt zQ>ZA_vT<_sv2T5{t7)!~6)P4vjlk^x00c8;V(#_vDvK1Y9D-4@6_`5YN&tD4N6FDS z*aNcYjEaeUj8iSpiWWhqE9Y-AsLG0C!T!Xkl3awgd~uFrRj@Asalz22>BGJJN?t94 z0%Ja9rmd~rU02M?wd!rY*gB(0d6r;b0q4KsGGUmex~^bY+zsgOjJ4(wL<+8#qV^9_ z#B1S!K!+OLq}P!)M8(xK)^XK%(Q6awm-}$s5i_zVz=(%AMPw58+{MI zxn{HE{paWECn)4=rBMdLn5AF+#AlFh&R*-{D8F?{)6f}+rY#lEPu%WvE}Nu=(V_!Z z4Mylx9n3)7JasE&M99)?&Ug~<=mUm^Zd)Dd0>QT@KkI>@ycb?sLMTjDSj4H8Xo|$N zyIw3Hc&h-2vpLim*e=D8VPX&MI2T4!z=~3$2tDu*=gftM0FJ^g1tqLI8A($ z0hUfwCkvKDFPL#zV!qFoGV6}(UbEcEN!d;>-sUm6g8dPLQd-EqZQ@uzkiG4NUij_n zxb=0BJMhD_WW5^dRo;!)1EeedWFcB!wb(x84Mjx0zVeMC_IZCisux4&D!ibxF2ysgB zhc4DQRVp$xxYNr9P@4kae#{d01_*SPc<{c*kIZ4d?;6k3*%++}i?W8X+-oYtb2q5z z8i(vMbuOz#sz1<6IbR0)hS0RzSBDR{5mYQL#Pv~K`%r-SOy3Zruj)EWG$~bm=rudqeEav1mWry(Dy_N0tjAE4XMvd{{Y4Uj>-%D z!q@`_?0JQMNz{7%%#|+P`GmbN^XpIxW!Rn$@43T0l`Pi z7Z{jTvGogKyiG^o5VS0_jQyLdh^-Dn87AxoPcYhJmwm)~@(+3bWxUE-{{ZZNakyoO zQ%{ItYr95-h^L-5Pd77@fV=7DIttcM<>Z4+0*3|v08~q0n@!(w0DUqHOyOJZJH#^5 zGKVqRgaQ~5rW!H6OQK~exKmQ^1_Lj~qjpu?#yFf~a~M<;K_Q`D<%L5>EIvI$fSl9* zAQM50FZqvh>RTla)(0Ojio0>fKT#Sc$#yOIjy)W>-gO>^aHz+Z6356ISM|ARm|}6_ z2x1B)yom?4fqO9j04%?=YgiIJ-a~qK*wd;Bek|hpU#N^9)~Sa+L~zVE$l@ z!I@nXgLYpT-%^;7U|{*t5{Xc{e7k-VFR&00<@MZjXyZAruhh4-1p{X}fJ0%!qsMWm z#g#yQ;gSIP8Lj*gUx*h}u^dk?lD9_UQs`_J4f)#xz4Fwg*Kw2R~XLK@ct zn0H*uLAp-Dvq$qDgRHa|-XIceKM&?m4WvUaL_Rfvs__BvB^KvDsX{3)#a_KYpu&ij zYs{hNMd}+$x_8vIWICbc+(Ta(;9}o$kw|uB^7m4Ol{WFb&j8I|+~8}?tzlo75WeH2 zV||H(Nbf8?9w0PAEq{f|+e(+o5$Fe}e^Cf$bFCllWdthDNfrw7E@+Mfq znOnqFyf#G$Lc1;QpqHQ%-Q?fI28?lahEwe+Go)b&hx7Z1#!{II;{DHcZ0Iuc%r}*Y z8>dTradO{WOTm79_>O>MOT#{POkhia=u!Edk{XLdy&{?woc+#~OFqtv?hzislJ@Pt z5mP706B)XifU>R8*WgRw8ZJO@<1w6Ar$cQ&5W06V*Zr|_mUacY*@-e9IZfeE2*=sHNf8oMH|30px_D1#m#QiZO8Mt<5us z4r2@d0NIWPMX}q%>R_`pRZVZqTTydZXP>B)Sxc=dW3L21bv*IYzaRS*K<64CbDSBq zRrM>gMMr<}EPI)?{B;lo0)tO+YqC&e&*B7}FKg;h_i$G?G#rA~ReI_HXD0XuxDk@{ zD}E*78dh8GD=w6x{i6*yKa;4{Wsgf*mFB|CmKW6B*kMLBFbXz?Vs{)C8FW{~rlG3D zSNnqA=L2iRv)CwW`i-%*N&7}tAw?O)$wY0SpHhtK&36)^HB+vi_E?mFr^PeXEn!FV z7Yy`Q3Fc5j=-@tPfjY+ z5wlb@d-W+)+>eQOv815C5S*>7ex^J#3YQ+K!S}8*SU>j1UOh0N6G<=$Frm zgTcZck2Q$9!)V`ITb%N=fzxPiG)m*aU7;9*muLGjj5c3~+nCybUMu-H_Q8fWEZ#8m zd6Xwna~&QM;w4~arYH@rEuG4}g4(P6|qktWM z>;l#r*h`qUrE^a))s@FJf$bYpyACFJk0RMv{aY#VK<%k(T2s%Y!fMEV56r|RzrQWE zW2}U_X<42FuQO*sujnI1Nw%TS%qC!^GWqeCCX*p&!a-Utf{#7pxm%zOIzAAQ3R|UO z5KQa>;S~5}rlRB6j2~}O=m z`-Y76Kptp^gD};3OyY_xXC7l_qeQkjxCS6lU1#}^1PZXycbM5^HPNpz33$lJdj6&# zMDT8gVoLRWd+ubtWOA!a%?Dt6>Qs#hUEbh>+2E58E0Xwf%x$Q}KRD)898@vCFEB~~ zH296)jhK9RmS~rc%E)lSYU&{H#|vx8s0c7yoL8=(3}su%Yw?H%S@PDm#5K&UX!ZRw z4((9xYvNUgkYTg}9!1{XPM4`mT$t^PdJWeoIpu5l_re~aVX z6iX9rg}UnFrlx>nKWurFHhJVcyvJ|_dc^+bNba|BIU1JC?siqLZ|ZJOV}qI*%WtNKdaoH?0oxIC;t*ho|7ieXgOi`2UII7}bkg~8{`8Bwj zz%#%x*8c$V6dMc9+SS+QHM{FN^Da;JT{6%HlsX!nO4&Cs5k9;nMZc!c9n3{}XPGbvs3 zVAY$%BB;<^Uqy2fU1;d8C7=xfb;CmK$yTV0qTFPjrbA!|Kg#novdYPfprXE{wIvIB z#x}{pvE$+o5Ck|cQjv3)4f%i#Df$8jVDK3xX{y+tF0CrD2T*2mk1$wSdI8vlVK9F~ zGOdG^O>ozV*Sm^zD*3rZm)2OWKd4HJ z(s!pf<`j2;5UK84LszNc_xqV|5|#``VQNfUjcVAc{it5~byuj-eca9#@oIi|0^=HU zItU4-d;$BI9`ZcAL^cR2-_q)Gmb{b23T(}0QZS%I{Grf zNr#_eANDAM9m3aM{Io07T(Ipc@xyHEgusJ7sJH-a)_A!KRDA zUr}q7lI2sV#+gEe+E<~ZIPL*l|?ky9CqIKM1Q;YAQ(t)9I@=NUr( z0EaUpH*62n*NJZG1E@q-Ou4j(sK-1!T)v&wdiTmppJNm~`H4+%BEq1zD%1`em(}#; z-A6>$sQxG$io$L9VjY(h>hW+D{IfNGiAS8noQt@6<<-mfCfuD?w3sZ*?~dH50|Vp6ldcE9^y*= z-k_@3gGH%zF{5gSh*8BU!~76HVSGGs^8p}q{{Si$;XVyp5XISUZ;7*j+*j@w_!U1= z_R52B=Kf|^(`)bk$69&Sv6){m8S3TQQQ1=SyCL-RxnQn|L45D#3>}keto%%=YgYK< zjyD7uk2q|tZU-NUZy#_@P3s<4-F{+@4$dp1toxM$U;r5zg0@gqmd=|00D6>lflhBN z&04^)y;H(^jS5x_;1~7I;G+Q3RIcCvlv@>f{7srb9FAp_KwvG`J*RTEQ^@rO*qLr} zoJVQmSvCUl-z`T4OjuP{p5x+EN`9iuHH(1vaNt>h;=KO=w=e)37h(SZux5$LUz88B zm9ad>10^@x4To#8DyQyWLCN8W1u!tI`@)+Ng@W2@AfPP*m+G1e7u`j)SEQo;}(s?IZqo$0 z>Pu93^B2AY0|&?vp+pwCYc%DlV5>KioACzvgJVZh_s9@+{ICX?2gh--!!czM7+S6d zW2aOof7*tVM#CA0Y(x+EiBP%&MtO*7aZsS*;-EM!X0P;1S)#>gKZ$#$bxZo026oh| z{+X9_&yA3IiWlU|jH5xp{puk>Zl!-SiM~MfE4meLsgdDGlr4X8PCngtM9yQDfbz2()0?#fcXsxRWOyqoq=%s?;h#)Byu|5VKDW@9J$FcX&KY;>2Q0 zsMXH9j$O<0g|^!Y`kw}-ico6937LF4JY%@ZR+h#3g-|OL(bMJwR8dsx&Sbr^>=Q86 zS#2L5_G3(qGI-)Bw1rBaubF~h%{;_9!=k?6x+iNeAww3;9tqw(J-8E0Z_fV!NMjyp zSm_sy)Lm!BqjIKsJVvuQ?kk8>cE?+ByMWY-6~(+2;$SK&vWL%!PfIL^%&sMSvX%>i zPa(_hX4h5+ED*_J&YQje08lu^LU77ob8O-(*JAT5v~myNrRI#RkX|Ser$fT`Q!qECIiNH!>F#&a83je0d6$_NE{pxjfKN78a_e-!OJ2Rq z`*kZTFcxrpCA84W_2vc`N8*K|LTh<0zvQqK<&Td40EjEf9fK6n;t%Ty428|qYy~^{ zb1_|JzQsd4kPxpDRpcd91DH@!#qU0))$EVk9wh<*FD{-j_Zs!JE+x3msE-shYT4z~ z6hE4%3efPp!;Zmmmg@R^>k|4R&^bA4h_hKXXc@m5gCq^A*CX$ULSn3;+kX&n36oBF zIzDBsWlf%aKkPEt#HGRU7KtIl<65SrX^-`0-;=Ot9UyXjKV3#m4 zX|=^NTd|zHOjfKfU}NUhDy>Rs(Hy4+V;qEo){bnW6N`k0_2NvM+gxd;W z=+*dzZ#FlH{mQGtyE)be6T!Yi`Gu!hRlRl8&p2SfyWG8{r&hkkHl^PR@SP$ z_?9g@&D1dQ7qA@_`9SHh(MGN` z8*Tpp49beZROIF@xr(~AKe82=Q~-Cw#36PrQ+|&zhn!pCtiv-)b432M%uq9b$C!kK zsz>(U^BACDN)I6C%r>fpF6oD{iRg>3N6~wU9A0b93G<9f{t1=Oi`~X4W*UeXTn9YD zOo7Q~jk&pt(J2I7dDLl#-tOVwUZW1GR0OVS3tK|93WJ_XhYWmRMSJX-rF`vmiym(? z3gW33CKfa`N-=7x@c#b*`H%i%q%)SuPEp?%0aQ2>hloqeq*C*92@4ez@w|r51W+}W zxz9HZ_(`kIJBddR2e#9k5}Ae?hNH&?97@!HVq|-3^&43@4fg?KZx+$<+@nI@R^rSI zc$~zz+pOV@H@M|oV)$bFteh42fvol#^TfS+#5s3+j?gtf#%0u~G?LlkRzP^fF3t!x zor$`4&CQ}f6mj`a4oO#c+Ve0rhUZ*;a|33Mcs->yv|8J?@|;U>JSJ|Sjha^T8xI`b zD!%?>g*E4q#!&|f2cDnIAyGXUuN}@4*|vN~K=6=jnC82os#W=yMCiM}*BYQ(BgwmE z?od*_H5SUMCZ7UU3X+rXxn0y1X?N;jB2=63V!I_dvmY~nj5-Gl5{s6`2#15*B?dTJ zy4y@?0*=Hz{{S-I#*+JsF_CstU;7YgW>~|^=4-;`@Uizj{Uejj#?XU>knDZTrV^+j zUQ!+Sls&y@h*fwS2lo>Jg%)wQ)GAr<>@9u0lB$p_8f&A}23CB7dv#6Af}pw9@)PbKLEC3-HFQw_dM!fvTX2Ms}ztUtJiO#cA$6NgkgJ?UQ%d=X z<%vKkynI5fj(DZ{OqGKmA2wo3#se^vBkvFsu(AhKaIi$ z8k(k)i-;NnqU!djYng!*6JWDFeqq2;0|S0Kgi4igPFY#(hj!7TjnHdfGK#u8g4k;~ ziYczQY0suzcM!xtS#{XDUofotg2mn2S~DJU+%0ZYePx$|aDlWod9I^Vpze4XxO6m8Xm_58r&DlHi+^#EcK z8V4~{OGS&K%&aGP84}tuu)FCZhPoQk8A#yRDE{XmtTAir%;Z{(L6BUW?CY^eoFzLJHiWn0em z3Ct?rANv7jhz>1fVR{3=etVjcSMFTQVu_P7f7!CkfmpPKDO8;{h^i6rOfs`h_g%3I znz(Gfei?0}zzw;N@j@Z%xpuhm9Qvt8QBNh;h7A`K6ZI?(09dDS+CYSx+Ql%Lm z^>+=$EE&G(f_Vld)o)HYAZTC}(LoJQ5{hoh@IbmNV_XBcTI_3N#=Sv!+IHK>O7Bw` zEnux@0~uNJOE4QR)5v;@W!T#CRTZAQgM!xxby>fAge)#eRZSUpHyQa6SQxe%GHPEl zk4|M;P?>LOuz5?A;=rYPEl+-;T%&smI`>mGSSAyu164LPvEQH6sA3ISk0jK{lpK5= zOFC;T5JBRr{h`<(s$saDyIDUn(SsvFKurF~Z~*2JO_A~s1Z+D|*@juk)&u7GkC>|k zLUHl?mRO~AwQ9PED0B{0{-w8S9F(0fineerQ<{PSMz6JBDwI@I9IL_SF`agIupjOx zb7ieo4m=#|n z%Bu^OekL207GQUooOCcspBzUG=}+hJ7>5C3^gtPhgP&|z7cRmJ4aFXv{LGt=4Nral z022<2(6#cInZj(xEGc*^MPfLffK$IT=)<#CJRP+O=8cl}C`sC45T=2Hw3*KSz%7g>VpgaZjaRhQ|3!BtZJ zz8PezihVJ0S(h-iZQCbZGMvb+*I98WLIqnGI_{&l79e0FE!Uo-sKsJz@7Izmw2UrC zdg^eGA(GvEKh(1M#RiSP^aVz=xqj^0xtm4e-Gv$7;Ei~|2!?m+o%@Z)EQXAQ{{YCs z3O1FKo7nDN-G-p?t5S&F#K%toyvHCNLpht|v)LRv;bB$lqsKD>iCM$T+2iIdObK^X z@N6rI%{Gw*m`w6R<}p}e>9!r61rPRNPju1E^o3y9Y1w=g zN1%1FkDLH-*CXY8%qcO*UEt5$LijQqc=F<29V>6;`Iaukg9>Vh!Mr*TE02pNnj7XI za|r6T`{p2uJl6Kp#K1hn^ZS^n4Ug+QPN9{1iOnE+{mZ%7@w+_1tiH%qpM-E7l?5 zLVbip=y8}m!K(vJ;q@&fnt@~ZpkzOpeB`%87Y;DYdjIL$cm8gT7G^~@N8 zu>y~MOYI4fv55&w$RV(BRfe0L0S9K&^J)XKT8z7=4KMCBFtSvi5rJZxGb zsmx0Z6@1@OV(m)EGnT01#B~88mmp4Won}}xVU$e&0KTKUfGef*U3|?!9y+!a^LG(z z3Di42PCJcXSq4l(#_jjfat<7B9Z)LG%{+%0?q;fEqRfkRUHOcw+RKYKXO0SoN~Rrg z?VL=Tc4a;vCS9CCvbB-(#AM@pfM5HFh=pc(DUtci$hnSRE0W?}#SNB4hX`7laV+oj z@%X7!XDAwMx8`MRorpQ#^AT}WrIb;XMuY4B041!|6zuq}BX8OO=lxSU*`t28kMS)v z84x~GxsWbsRdwGnJ40%)Z}@{ozTQSE?h)9(z(Ue#bFBXWFb%Sbt#Jb7hMA$wer8zL z5K%Q6s;-dj&f~&4T&$c#)8J8#&l-yW8vg+HoXZ7S`%3Ambz$mL&0EgD@AofD;lbIs zI)g#NsyvEIMvpR3O*m}4c$^Jd8pmzRt<)_o{Ph*fXlipyM+Sj?OcQ;tPMULm3?EWx*$S>^>wpxH*S~; zt_=_BB`xI4Y$>cS+yGt-Ssdcs?+Cn+`*FAk4n50j=7B} zP%9HS>2ZdNrJ|KoHM@_Jl)O6}Oea2MAL)l6v3i$(22*JO+5Z3_EXkoeZxP(0%CDd9 z6z5X>cnm3*$~o~lkgEAPd$M!Yfr;E=hC%TWWVRe*f6TC%T_*Dyx*h?14uW1Aq{$Um zX{c_EHSV~CRcz|l_bB}^Uf$CfG>7@3s3o$T%yfa#4${zC(2ss z>@|k3@fBr3DPik^$2S^ceTyyk6B9O0hM)l}Dz8OzQ!JCn$;XIA1_oyT0NR#^1JR=& zm}rG(pltlXQCpVbZ2o0{DlBmK2J^yt^(}RUr((E#q#p4g*j{m;5Gczlm0mi|iQfX{ zAnV7gm(s4vAX8p5@hG(d)l#1$^B0kATtdI1HjHi-D8(gndm-Q2;jV)@dc5|)D@eNw z-a6wF!v6q04`u%Va;AZoD<8VY<{`|aZp*W0>R~{0eh^H1zY{&FDK^G`NIcw1r1m=> z8m)Q64yzr%LF4fd6s#(v_Jao}2b<2hmT3~a#|h(!oI7rn;hS8P>GF2WtRSJVys-PL zRlFW0jwsXmBfA5I4 z3PF8t** zQ=f5=a2!=Kt3cC|Y)$BU2Z+|XQO(~G&Gh8ltEaC}@X=-|!Qeb|Q8kA{RJ5jGP&p$vf`13a4M{M|Iktan#h!)sN;Pnvd+gs@HeKt`hW$ zhc1}Ox`{d+4}u$(MIN13-eM^fiO-^KQL{5Y#$!`1%58&x%+3l@Mv`g%ktOLke0Xk;~+db>t-;`(J!Vh83TJ(~hEX6wf#m_=Jk!@uuPDu$FaH1; zLu_DTQ=y`}7f+TUG)ix8Pljg=J+OH}!J@l}z;7ix<-YMN3(Ns8w6i}E7}AN!mANc1 zA|c>iCm^|d=5=T*gSX>QP!CZo=5uEf>(ywUGCn>c4N0R|R&SqA5{4Y?_zB0ULP08( zhL`2sv?w_jpjTdCcnm2*d84@TAZ!?_gUQawDMgUIC)KYJyTqfAeoMl~L|d^owOfBt z8ecuHAVd4aIX{)evlluGzHSjYb69s`=0cwz5nFCZ+UDgrrdyKrEDMWOx6ub;2J3y- zZX@TxIm)=2u~1pRQj&K$S-aiCTC2C%>Ri!UD+9Bxr5i}$H*L2r^qir8oXxuQiu?7n3u17-vz;zd!~p z9ZTqIMOL`-z><{?ek+J8!dh?5eq%)J+-JCjw}kzW(G!a|$B4TQuf*Om>Kg$Eqtt%R zFx6kEs69{6ox~yVTiZ={Ee1KeXf~mh@-7Q&tb9%D_HEhJ4PqHr*-{`j09P(?XHwFQ z$fajchLmaL+-{I5o9iDD^G=!{GA#k__=#5Vsy$IExU2-YF?)uZ`C<{N&>sdSogC(= zoT{&5f0$8m#;89M*sM`k2|#Y}x$I>vzm5n2*1^SXaMlr@+04QvQNU9Ww3!0X@=NTZ zm~0sQzjCUPQNlkeywntEO0XXsSNn3)in7J0;ShrV0KyHL?u^e8kUevg^EruaxM7_2 z!c|JU%qkOvR_HuzehK6Me3lrMcQB5crw|1vDLsZcp+HTtJ~rM z&nc>2NqDjcLtn%y)&hFZK|gBEl>UuZdi{ zf(kXvDAZ~GOd3|MLcS_t3&F|8K5kWlfd$B6YNE;aB_Jg+jI)z*}`71x>rKMXA(^S?mb(mgmL+cysR}k^wJc>&BvRriC(fkhvFBsWM zZL;rR^ur>!Fh=Xh3j35}%`z;_EzUCHn~>9+@clt3;ffS&>r#m?Bc<%Huei~KSlPEs zUi#FcImN}jmXH8!e}rQVnbai~4NU_9ff5G;ofxUNH7-S~0Q5C^#J~-qDBft*`Is`t zDcN1j)_;KNMq25Z#cIWv0XVIk!`#>f?wp>rIF?Jj-}ILYy0Z%_ z04lCpyIHVSH>Ad1`Z|^P99pik_=HHg%U9x}Q)BoFT3$1e7xOS5b?Vml;v;Ph`dJO<$p1VmXCf~nDH{Txg2f0NSIgsJAPfW99(c9^LdBnKYoS zgb!|TLN_vLY(9yAi>n8pFr%{*_Oi{+?3JgTK zT(Cy{GQqs;$5QzWKw84$Z+MCg0w1nvIE}yv0g8E0%E7CY*0OeI7|h?4 zrnQ^7UhxAsAh??0=Jgj|-viBk%n3{GG8^vYNbiq~%u_D2k7sb#(=PA6EA4MG=Jq}rKbY5gDH9WECx6Bz*isq@*9jTn8OWY%9Z@%Vr)J+z7+|Yc zL#AX=hfyq&Rs#dUu1Q#!IP49C0C`+sEuj*>8Wx@1c5V8W5z`O^% zTsD9OYA=78ib4dcz0s?b9F;XG$TLqniZ5GO7Ke~$M&KQb7L3(p?h1hvHEnF(B z(g5r~hGA(0*ju$_vQ%EtVa-|jii(GZ=zP}YHBu0%?Fx!R$@&Gl#MC)B1;#LV>?M}+vjrdXZw{Qv7+m=IHxRx^vVk3gG{fE zVPb0EG&+jRXzF~3Z^MSZgHcDLyWFq6NAwn9{{Wvi<5LkCp`Qjel$H{6{h7>Im_EJF z2|9E21vKpNU3CaP=zZK18Ig;jLH__>b0-630=+~;f=r#p*yFYL{{UdR{{TUGwk#V3 zY`M|qWyNJr9+V4N(QYtdF40pz`Iz&YFuLJL`N8To4jl| z$NJ%(D+ZU;NTpg4q5R8$3pIw1NBo*F#4`Q{nQSeGOrt-`hG8o3Pz{A;xL(rBJ5gm2_GJ?ScR(@l&Qjp=7-ebK zh)=aBMeaaTZqdj!YQ>4HL z%zy@DIbM8t{lgR3imwq83@;ouR6_z?%Nx-Ubyc?&>H)G9Mr+seGe{lIuPhSY7Zl^} zX@j&-{{U(utieNl(d;aG$axTwY>J%}!-@wXkE9Jk`MOIZ^(l?pq3M{&DGGQ!B%l@g8P%Nw<^&B&R zy!HP8Aq1++H;uhYt*ohlATccgP&`D%R;!_R7?tpDyv(aZZ5QB{(129xRVj8ZHHGJq zjzg>)EIWg`wOfs7m>L&!WU9M@Ld9vSW;5AWWVU5acGu&_+@pOWcJ&anthj0a0N4;r zFP0ygmT=4kpY)3cV5k0yo+V(AT}*YK_NHlg7AmYin58HS$38c-zF{`>2Gss^Jg6|KkD#8?b?Hd?G@F?BfdjMI+Ko_xS@J}BTy z{8zbdLq>(~ho~b)V3qKP)z~*BdWQu7c!;nV=YFHf14I?e2$765@)RhPb8?PO3h`Xx zB|Sk!^DLVzc1NG;FlI~9J^tK#Mm5Ok=f^P~N=3ioJ<7hxw9_Hg#^h34V>`rff`}Rw z;65c%i$n&g>ShI0Okv*qMu18HR0`YXHS>v9I=^$xfDC&6Ac@7V5!uWEUt^K1f7l!m zLE@Fhxu}A>W7+SycmR8y-SaU;Kuqeo{^DRA23+$lxG>3jEsF^DTHu#Jx-1`8s+?A% z#&d|vRoXXM&;CUvy~xrnEzcvH*Hlep6Qp1(jrlV7MLJ3y3lCuc=TPnWK+xgTu{{T~nerA@1az9rB?KHm{&+`P~a#xDg)9(!s z8dZ5mxWGnlOFf7Rnsw=fO6c#ocOMZt3J*S|@KrLW4_Iv~-I=#$$2M^@@IdEy2`(#7 z$%F#4BK(m<6moFd{KJvcZf^I?LYvl8<*(EN)+?3^{j*}m0m->=^OZE0?S3R*6zzon z02YAvH!D8@l7%y0@K1k9R3pfk%b^ z04AI^Jm|PALT>D)gQ8`aIJx*sXVfw?x`x#nqhS8vy@4sl+YaIxQ~-J(Gjs|5+!~b)+RwzWaC6gpFZC4{8m)*m zlZ%KIp(ZM;1L9&;{2oX36FF2eouAY!OY$84qlK7j7NyHO6H4yohIpctrD8ciD@5t= z7Qp9-13H722WXfgijH}RXPz^jyJdD*rJC)OWY!B1GgTt`0n&XCMYx2|&H%EvXw1l@qx9~z;b#W(YV|Ozn3Mp<)+fTT82efxN z)?X$j{{Ve6W8u2QvV%&Bwyo8Iu=Ak>#Zs*uv|n(71` z;41CG+Bbr)lWXgra{F+Bj^d!5qTklxVxuv<8DT1!^l$u2r8pNLFMLED6$vgJbzQ~7 zN(RiiU{s{Et*Gu=7@Frxdp65dmc#i#2rkFj9bk1gO7ja#SQQ>MF^UyjsP_&}}0n_+BRPehzoYVIXQ6Q@W+Z=Oh z`7(*a>j>Q87lT0H$5NZpFzY{KWa ziQvwoFgl&$yby`yQ zh(iik)XBvxrC+;<)G$=A4`191(WdXQEY$ z(M{(XJ+PU)T9@YKXU?F0mk|~)SQGpA5QM)H@qVD_ioecb&hJCSGXDTm5tQVspP5}7 zpM|btrabj+jeom^l}@$R+^_?;W99u!Sb0UWoRYdvX+VcQ!UYYz|*&H>{)kHjFiLqC`n=|-Br#I|g8ZDO)>xv(o}wbB0o zW@U{B$iJw*@_=%er%@~*I zOWqewIrTBnc4X}7xY^!{b#-3<03@f%O0SB4M;ye8;N5)f=XXLS4fY8Jg2mE#XEa{G>KRkk;VIh55b&8U1tlFMo3>*85levG{2jb_=54C-o@E$P2L zej;f_yH@`IsG%il<_{BmlCz(~-*Wm5!9Xy0R+u>8A23krvAn8oq3+%B$A}snW<&8P zb<&=XSJYZgCNjr%MXU}^06K)@TH8#1U;$8BU9N>{X9YsnSH<-%<8@eGD9v*%l@;kc z@x9ByZ(;j2a`co8G5tm3q=zvHQNeEL-`pDN>2e(EI)KSb#Vdt{o@TG+W9k57e~9ze zb8pC8$Le8JMn6$#7gz7h5qfjRbrO%h+W8h71su5-R}_W}oK^GYbQ-|iukIEs0{fc$ zOd0WMx^6v9!z68|sMsd7dDVNC1dA}+PsKouB)&E^`iSTbubEmI0nA;AjPTov=&xp> zO1?Rb8VvSJQFWCSHawScW@<~Z!AhWUE;iz>sJAa);%K^xvpRv7)J=BOxNA?M!Syz_ z0r*Euw*?l$=<**F9l$6o9MbUma}MKX+mkKy)NwgYtn?DMjk5BzC~o$R8f(%@UabJO zL}MsqsFAtYMYmxq(gq0b1Zu|=Z`7xj*RwanTEp=XLZn90`ME%q-Z1ID>8WC{NY1g% z)V#2(aIIkC3!&IxVjoG0mbim2(myYVykAz@GZM5>MeVOZMjAAL+2hCc30j#1;eYin zL-^{?_v#6OMoUTgl(%(J_{ z!73ATcvs1lys%+yM*8McniC~ zQwD0-t+gJuqT1f3_8=CO$IN3YioxicQH?eWe-Ro>x?9(Lk?v&Jl=t9uE8QB6zWa?z zv>sPDQ`pA@?*mK#=J=H|8yy|^fJhdl-^a~Ie=HZl{ke%t1JJB~C2UN$ZbYycDz~$) zB|>W3417LiS5^w($@knzp<(m|?+2D%BB4Q3OfHMP+;)c%kPFG*B*z|A%M%W6*(P+d zOHUSRo;NT!{*+O9nD?1y8H~d^X!FcBR0Y&Fxzr$#&o6blr+vi_0X=qt{e*`w z^b4(Ard11;%hb7C0BME~_cD>JU<1>vO9J#tpoY8xwdGQfF}*%{)kDI?kSUE32&mE0 zolPl~z;6El_9L)P*x@Fek;(7`pxJwvc!Gwm$L8-**7?|_3Ii8$Vr;|f)Dx86hesQh z1LcuzR*U$VWx5dEb`WlWa9u0SOt@kAx0@xHEvuotRIZf>~?yMLoHRF@hU^j zt%JIUUT6bOPl%$M-?^=4(*&Je+=XZ68tjdjJR}Xx)y6Ar^5+C4xP`iI(}#P7WVcFz zyyq_h*5k+oLl+g<_Cz3BGzPg09wL2UXw!O`w>qxc-FzN++|?{N3wU+DY85MiNnZ0C ztm>i=ymS*=t~u%oolyXJ6 zW|M{%R;*4JjrNKGj0Is``{FT>)HM0(r<13n(LO4y4oGV<8E6RHV#MAtH;VGmtU(5i zOUZ6-V94IrgK(ulp}!1r%GXtv2N;gl@qLS#BJ^#1z9C?K!(VWtK~FOl5p^#y4>hf$ zPb|!n6qVpGL49g?ySaG<5z;N0UZLog0NLIdRc;OCxu7dgB-D#|6#oDo;9{)5OtL^- z#W}e%UT4Pcs>`pak_Ec78H-4}eSg`V_&JWQ0Vy}+b?kw*4h1vI#4HNEsSngnvlX$q znat%-Ae0`Z{{YljE|gi^B)R;{1IVAj)NPo;s#L5FmY6OoczQLtI*vu>GLb#V^WrerKPb5I2!$$m zop|S%3aMKg%MCY(G65|NWuuyR1+*kOgHo(1#BJ~>tRlyYw@eQ3jJs|)!~h!rYyNqI zTR~n8W)--=r9Hl815c9E-XqE+#lPGdJdHudk5C-?RI5#Ujx+P+_{;^~*7Xf_n67G* zX`Pc%9#<3?BH^b*(anI$qij%+V`QrxzCJCAke!}{{WGrXdC5v`Id>O6-mw}0Br^{eDNPTWmeY-$XzvI#doOI zXfz7=j#Of{_Sg3?r5vcGpX-_Lvdu5Nafqy^cp2;4aazIh2e;!;R2h~RzaObbzsES| z#wBXojZtU%l$Pga!x!_!yXREPD_&9?cfsZ!7!h<|Jw<8|8i8NlW{6fHk0Y9#aLPCI z#jYt+1=66+?1pS5{u-@2Uyux`-RaqcTJRWn!ph8$sYWbV7UQfL}fF6ldu1T_skj1X^w#pch{ zurgMFtW(cYnU%L~aKtPto_TWX#41t_lf)F)cq`C@59SUK&)`7PFgfhSc({Nocx?*TnYlo}JA*q~Qj8cSpFywX+e~+D9`)iF}R?IHz&-s7%4El zs%?dhZ_j#yWGjVZxqJ2zYabJlq+ly(El!n>YZ6kh--`Xr;4agn7}i$ycp%6q_87kq zq8SBpXD5uoPbxAQYx#g3Br1$$Ji+p4SoCaC+#Dno70?-93^2kJG$_FL`Ib5%c=XNx z0JxR_6{ao$DzR_#5gn;?R@%|mxp4+%Z4WV@CFsdg<{P8gMr zx*B6FkLiF+3RPEI*$=@fVPE-{voDf3>q$!0d}nv&A#SY?7rrXL_HxZzIM>WRQt8Ue zz;(K3`b-U6S!&%yU`Ppztm0Z)1&jE6z*Br&`e2P}U!+%ZmY`AIRm|MR06AwdvavnX zQUW1t2i33YbxMGem6DSpyWy3D63di~n;x4t` zEHROq0gGQb!~2KrVpM&Y8vg)_j%ML3vj*|;nSB!N8SyVD0?J34BBZ@3;?I24tdy(z z1Z6~9T%AHv+gp2wvff;L$5NO-L+FE+Aa%zqKxkho1z__s3mvSmG$(Es)BViDTPk9i zam1-1)*QPfQv<_XXTLLeAk6&P6B_AoY>``XB5u;3(oit~lDJboVSEg2(9R zJjN+xlWQ9zvK&+4e>1>K;*{de{{YENC^}@;s-;&Klo+yIp{E2;{QS&l?o`+~o2QVc zHRr|LHNczJ&QJy^ z=m#XzyMGABq)4~V;wp=2P+lCvW=Wx!`&$c-Hm-|S47?~6De+pgFjN;u#jexD`_WyWeDViAN-jp6!3oGq`$kVfaMDF-sOttXHY0ix#iSwFdH#dbzMxEV>0=)0J&M= z1zNWLP^Ml};<}H3PeeO_96e0LHv}1~ir@vQqbKF=S}#y5A73zZ7Ax`p0AUIXhpXqk zOqf#$Ica0hW7K#+oj6uy z736OA&A}E0vA^n{|Jncy0|5X600RI301#1n=+x1meUj8LuL*xo6hJsaZZXDj;f1Vk0A44Gy^aCW-K#qs z9WnPFHCdKjiG{ij>FqHHTn&-P#-nPeHUfHw+3W6BVfIl)2V0{tKmp~U&MD|%*QOBW zzls*2vX;qn=F?@R3T^n+0I*Fl(?+rbiWu9=E;AP_Ag9d22=54I0VK|F?gJbVL@=|) zlr)1-NYEPk=YO$tDcWg_E|!Wq(rIi`HFFJdrUl zcSYTJR61z+Pl+JF2t0kduwe)?)Pe}@F8=@svc8O5yyhD7@d=5Fr$+S|acmJa;wF_~ zQxH`F8Q^!fv|U1IU(JW;wXh*xqfboJVFY0OXg^@r4w^UL!aQzd z37U0>1hr&~_IxALbZr>{bwyaP@5NL(=+lJv*mtHb!vIr6KG}Hz=C*)xNZU8;kR+awO1+?V3tH@C z+=4^^(~J&u2Or9xfN!Gk;TtU9k~%w+sM|P6Kwx9^761rmgivW;YP6Qa{0LXv8TK$x zz>-^0K_`+H`Dw-u@9db0)N;7Alju;?2fd?D5n3fNKR;{03OEIR3uZ&ove7P*Z@&IH+ zbtRt}cL$y(m3g`Sx{rauJwvaF28%`o22v1wv9X=Q6G^=#pDAa)E_c<2C>zv5HO|8t z)0dbp7%}{EkABnc-9Z)u?neGd(2uo@JXnAxpGd6oF`WyT` z=o#fp06H-%pJ;=nN7S)W0VLahWsDPZD^28O1=(UYkW+7$C=U4Vr;olyZM2*z5|gn^ zn=?#sW@Sk{>t~2GrBXoTpq6~zS_+m$Z!E5q39$icmYAQfmHD2G&b zvahs~5CWD;fk`ig6jU=kDzcWzX)lkw)I%`x&scNID0Wl%P*%5f5mkDEyw*rSc35oD zcqCCyC?j7*@XtJv2qg2s*aX&B=&u^+woKMq2%Mt?SgZku(36PHprQ2{3MJrghK`wND2TrW5(E#-BQ@;9$i5N zHFtm{E?CCDau8yTbe~^A2nbS2Ea)P4h`J|Z49A7mV}1heYmgMFgpU6J-N0MNc)+GW zL!p}!exnvsZ`0Rvi9|_j-*Sosu;yJxR|w_Sa~Tb2(%teLteaT0Qlfw<&1c?hfr<{Y z89*vsaWNWvb4)H9)#Sf@V)QRFn*JpeEOum+e85aDk8OELS$W&6EZ8U}Hq}f}z?k@S z;p5#>nn8@$lQGs!IyKMhy(>b)@(?16C=<>paa<@goo;I-4k5FORC!eM^=P(VGBXdR z^mwl43m$N-W`MS6sJpuq=1Mgx84+0PPB7P78aqxZr!~i1^00RL40{{a70RaI40RR91009vYAR#d@ zK~Z6GK!Ks~|Jncu0RsU6KM-r^NW4NcFi+YV`UPq9UooFpfA~eJn_pviH-c~Q{{RCzdOrujHinIjl%HbTv#3f!b(fFhLPW?ym6VDotTs}y zSK-mo*XWY{7{(?slppVseu_!)nv&;#;ZGYDJpy9%Yj#D3$eVI}b05TsuNRo5&`N_- zrX#@|D4b}yPLPDiO=QYkdYI1gO*N)86?X7Ze@2+IrZFR}X>oDf7|vf;QZ3+!YL z>lU?oH5`0so?LF7W693rWj!f)t#6~SMPdCJE`ji568Im$-x$fwjY$Yy9u8_Q=*I66 zF>z(ruZ$AY5-Ce^5Jf|S5%ei0LH1DJ5ay499^MO|q#+7k6C)Qz1F)myQ<;F-daA%=v4HD#sLtGuP zxsf!VQIHb&7p$BBaU^9UwLZ@~)v4B*1yca(SL0m)L{ zj)*EHxIQeR^sn?pnf4!prC3tkLtlbfO%D@iaQq(p7{>nqPe(iGV2d+M@J{1DWTYWD zCj{yg6(sAkz-2lbzgBuOPqCHgV&I=*{j5b0kXyg<83*(fuL738~oA_2uaV z+VG-zN>)FG26%}HXtgKHe zc*cxuH8${6OuqCe*RL*8A6%fDUJLY9^j;8ngr1EEOk>D2ehtwJtW(qbA^nZ<`uM34 z_Abarsc@Vw#|w!fYZ4|Wz{SteR3;T<6E00-&VvuW6IhtuJq*7J#w<;&7_kWqW9V(2 zlUTkFcbdtI9wL-Y`X&;*xKM}Icsyhw3Qh^IoGvoz;EGr#MV^-$Y)Wv0%ZP)|9|Fll zTZ@827}L_9dFKW!Ym>yf+mDUMmr&XCAjRe^OIylO?VKB-i{WdVbp8njCyQBrMm7Hc z3?~SE{7;2F4d2GR`8;tnPA?|=A8(Rh@cKW`iIe2rYGWxON?l}c!i31Z3mYh(#p9hD z7FI^f6QQCGj*5Q+6@<%B-&pc%*~7$95#kXM5BNG?MHKMzmmuUAH%wK5 zPGSCmp0S>?7Z007DMs+hQBuAQiJ@pk`Ar?0ctaCoL9`&_dm(+J+w@lM2uLr1@_C|o zxM^UqP_l>EgjjYxl=dRHNbEvqwR9)Sl&Oy?9f3YG|cglZ3 zIKmSPEKFj1#NSAPqOr;RL=>s{Z-NkH7G@yEsR$=}5EE+_T)JcOL8;Kl_DW9$AeWsD z7c*l|LY-9;cWhAHlwTK&=L_P5CRQH?u!M|J+Xi%<6vc6&9Z`kWg^FJcCmEVjl%*>v zbW)5baOO_Yx_--~^vUy8@=$5djtSwDlH)vY69&tou=X}qifsB8*YD7vCMcE4enrY~ zgc=tJKIRg~96xAMka>S0v~`V}4(Z4X%W@95tr zrXrHQ%>{jmLVG6!Tr9jo5S&ewh@7e(Awp6$p}*K2XY2k8hq0_@^li@m`}z?|YdaST zEVh?pQvDV1S-7KZi&#v!XoU_JQA$%y*>qVNq#0;I@}({t!L=3%PAH`t&BGB0F)48A z{{ZMK)iDT%r`UzPuhJ5vOY`Dr>4-vNmlUsr%Fx)EMV7rtmepSZzH;n@gLA*^O7?nQ z8^pDkJrulEJIoTo#2p`UAMm}1M8xRmM%rf6akMJS&F;D7a`|0cG(wXtU z_9mLE!+EraNFow(mh@N9nb?{IJ&zlX2vI>{5W1be;C)R#h8m8I4`6c^&iGt(=LgY8 zOITgHGO*hQrW2~+iz8QZ(j7e?$gp6oT0?N>btp z5M?DCpWJPg7pJbDcw*qujfYXQyg_CYFDchTZ(?A!T+FsNmRvL{>g{wspO8Zr4HSuw za*+v{iH1=KVYX~SWb`kPneUU!60ZLML)mD=-;pW7@@mKNB&1an3!3Z?4t2~Yq#T)z9)~duc5jZ#wJ+GA!Dec7mG>vmMiS_<7uYaI!Ur>rI}ybOLf!@RAC zp}2b99@LpkLLmGe{L_zFV;d{rgc`yp6_??@7lw8|5LtrexX&%(=?8_1C&6%o5d4qD z*nBP?xHkkgj=Xc6%)%XTxLE9haJ(4#PAh~b1qzBbJ+b4=Ak-5sQ{em%c#{-tr7Jgx zLJ(*{sv%$lkAV5erFO#yAz8UZ384^S7%;YlLL@&{Y`xD-JH!-#f#p*>gyFBu{ClQDERlLynT)>M;opAf;ixgDu1nH#*dbt#x^waFZ#>U z{sa8OID{0?#H0YrHslOFm*BS#)x@4-Z9=0@nW33XVc#3a66B;W6#oD-H(=PF&oMd;WGHdkX0q?rMET>+cd@WT%KVSH3xiqT#NWn(_SRn1n}SvVZ0Sn8e%MgrOaM zKCn}yZF<~MMuA0s)VPpW60h<1`^JdF0L}B8_mqlVH%!-Boc{n>R0SRe5D!2Nd>)L| znduh(d>s49W?CaY%g6m=&$C#cZ+ym#1nLu%?0!l4$RM4YY8MZPYX}i|SQ*>p^MbO7 z3`ejY53he1+B#fr?O#uRFi@nx*0%R2#tPtqZMUR}DStTaRIfnOgnc#sFk@j5b<2y& zT|#BEmGY;?_dc=(AUpmGznm3G<%k~zpAzM=tqb#ByngY@ud!~YkD_FBx29mEi5rbWH@l@t1G$AKonoC<244*qAq=Ppmg5c$HZjf%@%qvA{e_*iYK zx?aA1auj4Ee`YG#yu97@`&h-V&_@1ygI7&Y4)a7Nsi6Kj_`xp(UWbEz4BGV*i2F68 zFMWEE`kB%Vc+>D#6eSu89=93-+^aLD@#aVI+ zeuM7?;s`sVPtP#O9*G9Ocy)o)&3}KaJVv1w@3-R+uBXWKTTcG~IDlSLY7>>;XEl?B zp+Gn?Bs{0v0|VMDAPK7-VTaBcU91A|1E2fxnrDDiEyHSxntfhlMN)^Uz7hI3F~*F0 zi*|_g+|9$ZA|q>TG*bB1G_p@bFSgLvHI_F zYHz>uh)ssJrm+-JV$1k&#XG~3$8isJ!4rf8`Nqw}Wlb@;zuf_WS8>tn3rKKF9{zB& z3#07%)-1X)kLiI(gbQc7*8a6HMMCa1!0>)^N2y#NWISH|dB6)00swh=>wC?q00U#7 z`1kK2JptUedR?ENK60q)iKE3G%^ibr`Ubw$qE++BhEPi43f51?5YwzD?bGxAv3D5P znIT*Dy0~vB0RXiQ?B?A*^5D-@=us1Nd-wN>g3=C4E}xJy`1;W%21q#`0 z;iS3)hbtnXExQW!vA-C4S8`l`w=@}nRD8sKZV88MbLcCcZS@xZoHCrxsP|mn9}%?u zQw(by+=Kd~qj%e5I%9Nc*cNq`0QSjl?&z1h> zA<}u}#p5oUzw0_l@QL-1;*23@=O9WTXg{pH8|nl2!wO90{{U=(?)t2zkF$OAfhZ-0 zn}0ZU2rsdJ_Z*&tc(o_r@x=?73kR>umClqM`Ydr!T`pmo97Mh z@rA^y&D|5FSm^T~aAmC3ByWv*9H=?hD0K0q6dH&)?zy*hi1QcYtivr5W8iUT`pxcI zzcvuQg${;HvFG`wNe+qwF8ySbdfFs44_D^^K>!^1k){acZ3(41Qe2s0`R6Kg-@V09f8DUy^Mq%00|Vl9~|cMeLkZ@VbZ+#^P0bPmis&u zMe+H>+^I?pBt}iT*3Wq=p+}YW`PbmqEex`A`N>bt4d+tY^|Lx*k1^FFXi zXp;E;a2f_mTE0iYa{c*L{CLe3XdR!S{p8Zy4StY*@Y+Su3-TidAPt@U;_re1kN2#m z0>p#<8_k`<%CFeWKW-zf-)Hp0Ry%jNmzfG*SP5bdqJ_mHYAJIb*bF7<^MR!e0o#*V z3uyp@9zH+$h#NweUq@v_u5O&*74 zyk(g?VFiv&T@Rlg3~P%*(%k_EQtMY(l@Q%PQRDtH4GnPYAqB!|4-*m4%7aSVt$c81 zC|iKQd_NyPKaAH-3AAo(Ud<0NMEFFacy&*ig}8K}yikn1eBk8}Ba7JbIDKjp1o>~{ z0;O9I!FDsIp8{Z@Xms>CceijfTB3q0Ub3te0-z_ff1D|9HUjxRe(q90nW@h!iTapr z2BAUx^WGkgy8ugIo4m&9F0``t^Yx1gZ)9p{YIpuJAuJJ8A8(VKQBgKMU#0Im%&3H* z3X9j(Ul^5=AOYo^@Kb(siPlifBD>$bquzg}PhIte0uafww6FL4vTm9IFbvTPCqU2BU0rBHo}+YI78paR)#OL8GD8_l?oKG*+6xD*d>F z#!U@4JsIlw!Ft3iWUzD(-nEEhDFFebUk(%ABx&!dXj#!`etCo#aHI|I_(2BC;6D|CG{_Qu>ja>%)&NR_H&pMX1U~i`ufObs3;5OUj`$Qn15dP30aMX{#d#8 zn-hNcXLJ{@^RlUVAgK3$^AeCXK%cH=s>55S#;}34AxG`XfR>1Lym|~J3%^^%^~eJ3M;1C}Y_PZvF2M`D`>lPV;M%qEP-b$fD}|JAC0nqe>r2*_*!n zP<=Q8=trq^jss3K>-uYX8v?QuPkk{W=;#!}WziFA{{RLBT7KDd(s_;C{g~Db1D8)5 z@qi@kggYbcigx8gOo8#Y@?s{*A>>>4@ciQu2f&r)t$XXvBHc%CI(iTLn1f|DJ{|rr zRl5v0?YQxLGd~vGGtP@*Q{3)y2`zx^I=LFSSn=_@r;m)RRGwQpZvnLC`K}ydEsxT#xuB*5v^fi)5Wr56iN@CyyxXGG$8I&L{#CN zOiQ|0N4WFf>&99Y04SdbTmULsuvK-gzur1uIzWQ2rWPr$ppKIpLe^{(! z1Os2g(~qC22}-kE@82_ji4du1i^Mv8;!BZ1>jSfX@N_wFNw8-T59=0M$BPPq=w&U} z*|5k4D~E(O47KieY0NKG1cQHPZX=25Uw(-0fF=8^+TUXumGZN|>nUpI88}5Dl8}pPatbLE`s^VT34G z`N;#$Dt|eq5^N{&H@w&I{4b4TTFYa%-Bb9+T*TW`zGl_&?<_aUDRdd2DI@;?7@^Wh zIlo`QfeFAP-+pws$q^_o(Dr!12s&MgeewA5gkVLh=ye%2iiD&o z!EZY8g4!WEkXG7n=?@r=BT*r}2&LrSO1z|oNYt`gM&rIBKztL*Jbm*MxTMIh!oIOB z3=M20rmgJeSY|-FdnVnR@w`!e^^BAz|P3; z!yB!5!Gad;6|gJxeDiq?>qd~RE});y%L9aPb`;jvpE#-#XbgE(F2Hq~xrCqD^mD~> zMS&t{YNFV0c${XiC>@lOeg6R5VcH3_4NouoxVFBAqe8xl?gW_xU@X6gbg#W!4Kx#b zyA^o-^~!}fjAkQ*uY6$8S)c>WzJDFU95YFS&wSSYH=gX&Z6zLq@q?)v+kAkKEfeDk zl>nPSWWV2YM~X>MDdL$013^%1@S0y4DDevS!AUgy+!TRVn{+=2JFP#Q+Bl}T*FXS! zzVlOX0265uES~(`VYkE*4i%t%9$%bdg#ew31_`oxd7F}Mqy=aI+PFyT_zlr9GH@e^ z*dGV?^^FjBX+E!UU?J5107E+|9V_t(gD^^4K80zBg5Plbw|FtMRu97%ob3S*!1pFv zw_88fI=YIiM&PCZuDpF_6HX1L|mx4mJNmu24F{xU}!7)R$z_{xH%g?~+AA&7tDHi|s#N9zS& zLkRgXYJ6a#Je6bjrxK9CqTg7@E)^&9v(^xbLg*MjW=-OC93pHxuBnb{1)vvx4gMdD zO&&_W+W;(sRB&hy&A3X~gg@n*GKg?UEjw&?rtv9xa%|&4xOohiYnnnhk~$$MS8Xs- zb(lGURKaQ4yn2wr4wVTWeavdcAtH=o(x*5wOgWVn5ZKy&PHzCRCXZha8y&e!i&sIU zjCSuGIALR593FYTb%+?K6G5OCTQ|1}&om&q`2eQ#LWqXl)t8U>F(eJ8HnIk^eRFu+ z5Jf3VI5M6uOix%tpbpLHlYbvL05c^*QUlxX=MZly3-~HKEH{f$2(Ju7LdE+R72Y8O zn!CLyv8E#u8VUxYPk%c;v1p|LN#MQ>Mfa9F+$x^O_2Ob1mstr=Z1bhlaN=4juvRsF zUEyU46Q_FI@VrbnS!^OM)+4VzubfalV8m4*d>y>=j^tApMM+wkH1c53p&BP}1Ihdo z9R?7Dg;$B|*Pl7s7^HduH7;43kWvl+`QE*lJG$PE3&Fj?t}c!+HZFKdt#?=Heth7-s5B=2T-UDR2@iV7U~Yv6__^#7*gp(nfsUi` zJ-EG%fGO~r!9a<0l|NWT+SE2bW@zE}TR#}jL9j2`JmSR^O^WsDtS3w+gP#51Itd8H z?6(gf8fag6T>w%6x92FTG(mEVQQ4sUzA)g3fY~PTp~s4@v^QAdj1Z~U-m)HtLfkTI z`ajkkQPoFB{WGX5ZG7Z`4#0!{7!zyIT5?g}jpH^quFMlXTox1e+$i;ky?Xp*vgum# zf8H=fkP*E+{<0<>+KoSAHySl8S|5u19=yjifK=S-d~^Q*GoD1~(t9r)gCNwTznql? z3bail_`1e8OHjvaM(R=@IS8<&i&z#5-!{yD#z+=}!p}Ee3|}ZPDrf?w?CMNH%c6v1 zWN^4ER8F9BR)?eBF!pHDTd>3K_1^I^L!*QKa)h50_Ab7?I8M+2FDhzxzHi=20jcWS zG;Ke}GR<;}NwQ5O@!N!fr9y*aX)U_m4Ojzp3sX*>u1wv{V`UT^_q;abogJtihxl<* zmODL$gpJwR?-U$5#JW^!=rmcsHy&4rrIJfgO6-@;91C!dgMV)?&a(cDX(Ca%7C$Oq#y7+NUEXdm||=0cTa~CiN)nz9ev(9bh6sQJ{!C$t-m4IY{IX9j5~4{BX(h zr2KOnJS8}OFu!9s{t{wC;6i^~aS9)SsrP&JtiC{Lk@~X)@bFUnzH;SQ_eJ_W#v!c` zpC9GO!qqxRR= zoEu+)xxKFs#$G7ssr7)Wbtv*&)lynwYm3q2p}nCguJ{Qj_8 zfO3mZ#~cr}Wi5(dK)#oldhX60s>8Q7hu#jj(W0aMS1lnrH%6@su3FUhZGGB_0|@(dAl zIj$PT%v4bvMP8b|O1QWRgS&Z%e0^^uoFPQgV0)qWimC|ZF2E&fd~VY0P^u%X4<1=FMc04zPH2j4so99VrptiGb6Wzx zOkKk50l?PU#s2^q0MEN;=6G=A5%74zHE?8M)(-_BnP{VGJC`KK7br#|AZ z%DTZ;l+X=B0#K>6?mc!sroZ&aDGhM(lARrBKG(_b4{gBxn1vba%I1xVQ_lX}kY$Ks>HM7p~;O!>E@;LYHoh)}y*NhN{JXr0= zSVObI4!#Y4t$gJ)l(vF9y_i!Fn4Ex+?N%n7+MXCxyHzQ$_4x7?X=uq9bRxR(Omint zA{ybKbAJ;bM+u>TuaG5O7-fb)G#f}tFP8CB5VRY5d?x-ozAg%o-jqjZ{P^CLJ>@dOpy$|{->exmLBpV{dL+q< z$q4u*ttT^=)9WOzmO>6Os*jM2d0MPjnq{xnNbTzDaOc&qXT?_-S zE;E-X0L_~;*{#ovzb1oAs6x6MxUNOxr%~4lK|9lCE(^#t66&hf5<}-CR^m`sZ?anC zyk)Tl{5Fan^1}QD6{Ge$UyRc9gvIl;(llGO!X-AsB_@*U!6?}?rei79EdjeDqX+dv zdb4VZni;B~VZ6|7fXGAoZ|5o00E@5#TkxlRQ!m8p-dX7zShBc12qhi@G&Q|D^M^oz zY#|YM4cy-xKoWou9T#BgkN1mZGA|GDEjOCN=H>jntv2X3l99QjQ4vKA-4nx0%w8{6 zeS*_?Xw?!rUQ&<7@KBB-gVNhItRY=i>pkk?z!t-c1{~5bgf}I53D#sP6_E9qG(bhS;N%hFUE3L6{bH=%eSEcpVQh@?fZdS}Xb9 z3=eA9xxZ8`68P^kT8u&uzc|oN!%6;s)+3&e4}W>oxCn^-{{UD;N;T{5bMM|Y5b_59 z0Bu}iMprE8{{UEvVMz$)@V~LKm_+aeV{{T3h4=IvHyAUS#=Hwd_{epvNfLkWJjD<8D4 zBPW0>_J8IawFZEl(uu%H;rEw1U~v|5_}|xZ5CF_1A=W;5FN=&&MT`;}1}?yuO-Xjc zuv6EMMpkNvh_b8!cQlrdj0^BLqArJGdfR+sP6jMZnJFvm6Ihy(7V)?wmF#Y?EPz2O z?I*Nt-?`QT&0n<{UJ_(00&ZJapl@F#$E(HJn%ki~j4>8NfMj`zq%iFSHRO)p zIFcGdMy*h6Kz)h4KoZxD8mu~brgcyvl`3`I`tj=!)v8za3rjs}S%HjzK-Q@vQY&|p z3(bSDF3}zD<0%{+z<@~gN}oP17Y($=@U(fc$#w>{D4S5b072PtX28$|F+iR=Oj=RY z(w3r4=~H%nNGstPEY1%nkgk5mV3fVEDep!k@9+C~tXwW-$$(|J8` zRohv^XT*ITaN25w&_|NGHMGB2+|bMjw5jQi@6JXgVvHP7lvEdsvi|@$DvjdJh6tiF zS}XU2bl?h~p5$o>Xg;18r4|4mhQ_h{?&fXUZT#X8XMh#R;5<_Z2%ns%?-4qlS6|LG zL!z}!d&j7TD;LtgUz{Pdz5yw_OM}`CMj# zIZu5ryy&&*SJ}Q|<;>^Amf7ZQxG_k%(nr*7y=O z{`1-Sf9TR7djIRsP2COUfGT*epHztVquf{SOl@Z}|c6|I` z7U+eR-8j?VcqNgM!Fpc_@$UdAaS4~V%X7!(Bxyn7;exfdWV6JS^H{PJUDDoO0n zPBGNpBw%VFQ-DyO8k*NLX23*KZicI`-d(B90H7)pL{Yo_U>t<$!F-YEZrSo@Bq}VK zwb~qc`@u9XNC6ZyDpBa(8ktIVfPjFWrqj3)H~}o!vNp8mYs@(3b-tDLy1h+YF-Wr1 zLb0*%EZ2-*rz@lPtW0HoVTjPe0b{1y z`_0;3Ay1EZN&qq_)&Bsy^OoTsf(h;N^WzkNmP>7Sguk5L17MgRTEEs&1hXLg3;zJz zKA=NG{AtBXvnI?Ij^`qTKxunR;V z9r27v4MGO{eHy{(Dbj%d0C}Jl@^X&aEeYfEh-;&D0nK8<1F=F2t;Ig4alkh9plP$n z*da_nC96UfXy>1Fr@Seu-9pZf#UBx-%yPo-r6D>h1eG;#)40=Av_pwDE+GW=XYgrv z^60!X-)mMRaFinFo(_qzcCAUKQ#J%<(G$Dd^luNXQHIgbSpNW*7^5Oy9!n11M(=om zMF@RTsc|okrm$XVF9B4velesSFojhayDLw42J9>;eE?_W{9wV=IG3e?)Aa5ZXJ{4c zL8aceh!;Mp^|W`hjw^1c)Vp{FaK^kfV5ndDO*6(6 zbPxw`V7s<*%+iH40MkSfFE!I8LSfjQyPjjBt-$>To(g_(#psg&s&iv{S6I8X%A)XU z`Y7HwJE#c`ni4swJz|iWfJ{1kyYaVJG<$c)pi3vIRN&&updzNr|( z(YK@T4RqBi2;EJx#BJ7X$z+h&?%Y8F@5T%+?llAi5q8EEn594_)4c#TlE=NuB1oYq zo*|xWJmA!60-Nu~T;QUU{JR9|S3HqNr~OFB?r~fzQqW2sF@rRQ~`N#uU&Oz}Y=-5ZEQI!;U$)RBdlQPy3iW zkklu|!caj6W6|Nm9Z0V>?ebys15Jxh`^GYrj83RNnzDG)G?!Q*3uof4}D;6%bX~d6q(@GyoaG1@rZbV zeSB?xWX#X@p$5O_DX%ty}H-V6clW=Yc;$6Fo=*3^0f1+XdUIV%?NLW!mV|- zc2N4Kaakz9l&8Nw%%vg$c$9t#_uqwrD+6~`w za*5c`wMhUW#+L&0vw0kD@1~fB_qt$PA-(JS`NK2ak|_#lZ%3b4)DqKhp+Jp<`ND#L zPRicAANH`0kW6yXBK%_HcL_Kuy&g2ZlPr$;Hhmp7-MijeR^T*!h-*g25)wpnfY!A7 z(zhK~v4KxkkJqkX0ALGsJN7GIdcbME;UjZFhrO8ecgkPvm!AoX(-b{|Y1BV~13L)3 z5a>kr71s})%`3_7=Y<;ke7=aWfyOOO133T2ZN^g}6yJx}A zQKwsa?-^=MA4o!A9Xi*}un_16@rI+?(YLJC$@noY)CO|n#v#~ z6o7$M3CZ)Gvi6iIJY9f6NjHPAY(;;A`tB%QV5o2jKYPK&Fi;2KEi!;Tx~H$4kZG&# z?~AM#$g*hr$=brhyR@`#qVwrBXtkpKdzT zN)3PD*72+e7$iFIe;CauN&rn$-G6w(Vpy^sA6LdPVs>h6sDAr|Cdd)+CwN10t`Sss zzx~J{uBb`~F;U^w9e(E~>}yd8yrBtDl0sX|x+pcF}dbG6aOX)cJ3EhjKl<`Vr8Xdj$p zK_ak;fN&u@*BZ7Y0rswdF{?ackQn>@M`$fW6ivzq0TP)^9VA)I92JRlV31%c>lNe# zLiMVsJ|B$hi0DS1DiBXRxRrc!=v7_=kp~F1p`LAlh=_-o@sWiE?D!}gcIF*z$tY_@ zFMIQ>3LQrqcqkz8J92}FMvC?Wo}9D4T3e~%y}jPBxF~QTq7Rpwyh20~n2A!e=_XN* zf)GizNGZ*p@fypdB_X)e@LZTeHKPz8fR8)DnSw{h4BAgF3Z=N z(btrFgF#fO6G0UD(r@D&6st!_C`L;x`nUjdffVfUh4U|1SE?jb1EIHXca-IeIv^30 z8UZyjIY>{>W|D$>{;;<+T7rD9tPJ>4ft_(353VnnKks;snP}R5dHDV1_}D|){{VPU zCFCf4+zj4|SZ&Xr{$Vjf>H?bA`nhysyxNcPhzeDxNaC+ENCrd~O@6tomkMHZUp@2B z87~4*m(V;cp7)2cq|_qv>qGa1i<(;QHUJ#)tO8?phk$$k0ImXx28FfJJ;{D>mxjPK zg8j?=7?!{jO?;gk=KbZsSI?v9S(@J?R(YfROn@MjU$bwX{9!aC2SoKI2nMr5`j77^ z+e^z`X;r7sa4=Coi>*tp{{YtuE9`nZFUPzKPzoU@oAKh@Mh{A+uG$aYTom@#{PBqr zGzn1ngZGYI*i?$oDZDEA<*57a`GA@B3OVf5!mQAnC>^iF*PNkMx{X}e=qY?-03i)9 z{a}bXE&a2-Af@=t`D#Yr7~YpA0HHp4`N0&Hpt_~ddXKD);8(`l?@!GzQl?Y^5PfjL z2^8ei5xa)#PpiyeituHzK;0o0jKGsf6_pc+)8ARcQhW^$CHTv8%PaSFG|wCLaDfKU zL$HAYUB@7nxVD#rxHryBpnBEE?u`zeenG|KLwAB5Pe-O>5FvbMN-fzuxXIwMf+s0#f*9Qr=?&WF4mZcLoZ-C9`3<{_xvlz^!7s?VnQv z&l`$;dNB#a1yu*cpEpG=Apj6$LN4ij1M`a50ZDm4f1H)ol?y%ZkLv`sSAcKp?-;B_ z8ZNr&{{W0*Xz>s@1Zu*C7XT7B=k=D_1=`zxjA2gV6;H-ih1hD&Dq*jZE>jW_dp+VJ zpmZTa{{H|OBDg_q6yJI%~Ubj@j2O**5$&JMAr*?gK$ z^?~Yc>QaSYMpMa*LcrSYEhdmQCo(8OKoh=uJcmrxMsyqll8K~qxI#RT36M6m5!Zgx z#H`2-D0SlNEJqaQ`YJ0Ak0$iRM_B6d3c86TpCUiYr{7Z-|l94F$?bhn~$LX<1gUiu;K2JGJUlKxU2UniEi8D7B zH?PP0!f&ZA=Z2m;qj%#FsNnB2!&*G~%APDpXbUHDdElM6MR*9AcM6BKQ_DPK0BIrU zD$eQ%RCenMBy|d@Hy7T&TEJ;4JP(cQ&astYS0O{rps%fK2~FKHy@SNzil|#UKjHZK z#pgMxv-`#lwM*ztBa@hLe9WjYxOnUKS@DU`CWz@9KJwN}uf`+0^sUXb>iBQm!ZF5I z&%5R3Lsn2NS?2k`5L6KNfVsKr$UdE)oCd7MMYIr#mKuwM3O0HM!?&uAxt9TSEE+g% zM$-Vpl_)Oioz}ka@rrbkRQ!qKxk@xzN{_*D84R*@Hf`wUo$D2&PDP|)K4Q4^?}HCe zDPlZtb6`5)8$|2ZW!4Xfh|776`j`nqAsiw+UzwJy!wn4zHZz^kd4Wm_flvr4c%4as zs0liQ;HcRnp-x;9ZF`Ni50i-Y>o$=}MgU5xyYP$Z;H+{A8&Y)eNbAdr=P6Vi0?^B$ zur}o0#R8jyZ)3kXaYsSSe9_NS^5MY(K<6&CvC`umL9}Q#>Jegm;4x6+eJHa3D9?)_te4e3N!M}E=4ck)$r;MZhuhoE7Q1Ow4)w)YXj zY2#8AMpX7;3M4%?$^?awFExb~;Ih08@zMCoHA{Ux!s|OixdGiYro5T4(Wd;CefJ`G z7&@<^>lOhtOAs6Pb%`*Z*P+42f1ETXl!K@&Iqpm!>@}>IJTI(NjRB1V!Q%4?D8K@j z<-V+*ut`BhfqD6UbALb~LqSlNrrx07TvT{M)sCY{Hq*`t6)AuNonF67FllH!4}dL~ z*JZ^CVi*@-8WwHYGM<1Ii&V~y2gdZ}?;I9B9jW3TUSc#1v{L$|HQ4AJ0kRyaHC5pL zH-|(vIT7=xbHnq5vpj+>`_q2#99pe2w0B(Y1$T@irqJ=D$Hoa;QFQrlj3GgU04nvG zJmQE1!J&VDf3?qqCGIs z;^%|C-JY_hk0L*eHluy8+Xth;T1+@FPkUD?E6w^`-T_9IfybBqU~5t@B$gpMmr~p# z4IGtCd3fkEq&vP+ySjQzBsIc=CtI86oDjYMekG~5YWVSoG^D))n1}F&=0Mm%e339l z8l1Qr%M}8MAOJ{u&jGj8bL~F!dD4`6G9%+>hY0B&Q6I=C`hCt}q58HS1qvze;|Fb0 zfvd4JH+9}C0bFJtS4b2mubiL@sBI|N9xkTs-WMYl0|C7OwDLYCAmX$Fg%DJisEzf3 z*yhCFsq~hgSPBtpiW`#o_g>&BDg+@8SD!5Z045{?fV%muLz)(1zzw26@ve#LW6)H! zCxV9upIHy5aD$HPey*#USPzoOPa0nDlK_%~bQ%j+5ubR$f?n_oq`P~w2==G|tpKRH zH?B;Y0S#PsmH&Oc~VCX`aDZS8@{JYh4Z2!8fZ5 zZWMHanU0B;SboQTb*i$-cfmW}`lX%QcP&LtT_=tz)k*{9-r13Bng86ti9Jf;SmrZ7JnLl@2u109m(SA>S@7J!Jc1x_=>Z(sEEj#Btbdes3AMMr*3N^nx5fdc3I_18ggXsQ z;!KlZag0$02JYx>ILhsONwe;BeJfJkZ&&wp74 zPf$n}+4|NohMQ8Oemr>mV(TarQs2)tl3}BviSBQ>0-`j$^lM)K0C^~IVT3g6{{Xp5 zY_?kUo<8s*(!z{{SXK7nA{TX)B3g`kpdrH(Gh0_xZ(gN(H~)#!A1< zTDycMy$2SAQB>*)3JEW)N24sT-_Gk^Ka2%AesVq=VnH@8|sZx58}B8n?fMyh*Qz%akk+! z6r?myfcoYL(6dIsqjA@EkZ}(yK!8Xxi`^5~x?k#A2rAwPpXUK^9So#KMhMz1-aISd zax`+Do4vq$n5*e&*ul#|vU)Cn_80_wKp60=PO{(!&FHAK)+O@uoA4R|;j8ISSC|I` zNL_v}WZG|0-T=0s$`wzb*&TW?`E1yb+FH9g`o;_q!y?pt8`80x$JxShP9j6!IDoJi z5FbH&LjBCLq$C06)cQLMif`0PDs)M-+-?dMhKHqzuNelLBn@}hC(bmG01B(EclgQE zYOWs`fiF{ix-I+4>{KCp(GGn5<1mb5Cz9*S5tn3Y(cl{9{%#*^LaLpyJn_r*kf;KC zEMRDAJ$YApoAY{P5t6PS`?Ii3;6xvL_staszry!Nl?%OD9FD$esIYF zU}}(WZ`Y?0O?wOi)A)2ZyUYYfwE`9F*3UR4;5H2SbH-Xh8l=B(yx$av)#s%3fD(;H zRr^yc3_PMApFdd2d&plsoX(7k)B0t2j;XNpd}57qC|m2-{9;OJU?;cnh%yNFL!Phs z%Ga8)(c$iMTY{GMzHs`e6u|MfUz}{CApZaW%wWS5Cy#aIDv}B*U>&W;fmLTqKovuI zyU2Ilk9oW!PzpGE`8R`^yFeZ1pWY*N3H<|hu#@g(;!I*o)VEiTV zb&Z;R0ZPcnXP$guLLKiu)#&NgCWsFUv>I-=yjirlAVfTy{c93I(6;+^=hM>)#DGBI zVruw~EdT-UU^Qtp`#0+k8!4OaLig4=K^bPETBUs5C!EnLd?|?ll235sm|EQ%QZ$Es zH>{sNhLj;djSO0B)-Ny;Xw?D!``qV%NsCC^i(CK$_r0I?@mne)$7>=APpOmdCDIN|ufKWmNL;ZX> z02vq;Nf&_+J{+Q2wHmz9@UZ#7z&=_c!(YI@U19Aak+gv)MXlVLQfkXlDqibJ+$sl_ z$5ARTshku*A`b$(X&83+m;<;qhtWC`oRZdsvXPn<5~zI79aD>Qba1%7uUzUUdE4>yV&$N1(^9^M_VN$2A$*^qDd z%I~;DAQGU5gTC(c!-)J5PV~s3M;PbbC zGn)C$z0BDF(#F4o2e1oO4M2V-D6)VjO|HD(^Ml=#KuX%bI>6)f3NEb;oY&Sn!x|5r zI{yHE@p)tRKx<77ylcoNr3FBhK1SPniA`tV_m9`}gHZ)bc$^6CdGXvtkjPs~+s5s& zM+ti1Q8bZ&X%;f!ZnzoM@_m0sQZf-;up6|1`yUt#Z5uiW@L&~2WiC-1MQ}>kgxA(D zZCg~>x%m`Ch`rC{?tOsXFaectZlsH5CKEUkve!fN2>BDHsC8i_OOhjQB4Ebh}Ip zjPsg#sscwr6=H}bKxlHgC|hf#IQaZxff}_b+86l8{i8vrIw0C~R>cS&x;Z!_ zU9;#rZEeF5pbH6l2cx@Oga{fzQiBlGdsNCv@2*r9GD{L~8H5#ytu#A+LM!KXVif#CLoa>UfR!7}A4S8SLI| zF@wd}1?ivH@0jHIB8Zwn>8W*u6iAH@n|JHqa1PgEgUt*1!e~07o>0YtM;I8I*PY=8 z>Dv9l^7wzeGyY)BI=$h1I?1Gp`pgP(;r{?!C4#44y?pmmn8~v(l7!juAPn;5tLi?kLsa^!FdUS4CS2CA#1JF!MYzK|$h% z^27j9*iS3*tVHZY@*Va606y{4VYLSS9u68pUf`F^9{l6oi)Uui!+#SLQFxU|_kI)n z<5=DsMXxS2uN1r-o%8s>ej0hveUzuhX{v64K0z~eM8J6M_D1X0C3{pSvA!g31qQZ+ z2w&29_UDvb{zd*Z_kdL!0G+kz{{VeswPEm^?z%GTBZh|pEb{)G=)j<|7bL0VYn#FI zpaBgxK!IuJ>kg>Ae$aQe`MDlFMGC6g8hm?wy=_$6Q{`8Wo?r``$z8LpBgDcJ2P~hp=J}lvjO4Cvx^(5_Z|xU3p&` z$`64+qOb^(YwgQG0f|&fZENxeUqrcKG23b#ce?X%g_5TzWsZd04R3fTV1-0T(P<*M zs<1Sx2GeBYJLk9@fVMPWdZMZu))K-38W<84+h7jzs)Sms1wwYW!)_-daH}5zD~a#N zoHV6zhG~J)UUPIY5r-+%;s*Wr-Yk%v5cH}3_l!`XO0SST`lKc^rdxo=YDZ#9|1sns;BewlszZ07e}IhUpT3!Q80V-cp>wR zOp2{3dTiVCyd*SwA!WY3=80SqUx%&{viMlh>P)DEfN)!JJlk@rx>8VSL?n98lLJHk6I~K8(HcYD3a5#?OZcXPh-r6q`*O zcI3(dx3E&lZ4bo4C{^`B$Fc+XUgUT*+KpX<3&+m!XzIL;-2nZa_{K1JD7!w~WFCJ< zVkc=Ho_mW&>3Wg^7?=GDSfabw6Os7Av_%CA&HX<=7=8)7hsEpf2FM;rX`tJ#{jA{+m`e`oq`!FstxLbR%K30qk1vng2hcIoqHDXl&bgqfgeCLF=H4`= zxfD{^dc&baA}*z0IwXpu4}H8Ggc|Ky(xEN85nq>%&nr+wbGv9f(i~4$W%q z@ar3}QU?a6_jlv^!nb|cDhhf(B;?IYO+Z0J;c9(k03=YWTGyX4VmRgf!u}3D`Nc4m zdYAR}em9!kVg+%#&}+C+tyFcbzBk#A7_ehh@M?J8NVJ88W%1eK86=S37JI&avYZ13 zA@F{u-XRt>60QFLSuFd4Tc^X2WZ~0=DE2<4W z)%Bf{Rsy%tZojN}27)&O#XGMW%~8+*M1M)|5jM19d_6F-GOXHR9+eCfRA_)68NJS9 znlVU(lf%ofn8oZ2{6Ey$(-CM6+y~dc&Q$Z&s#69jY-4oz_1q?k32vQp<2!9tLXd0d z-!N4JVw2Ryfa#n8LNu!W-;6|wpKe0y_*`6SfI?bm>s>ac1({$)fuwq#Fr!3Pq%Dz* zQ^vU6Vd#VnjS=;Iv&Qk=vGEV+Rq>|+rbA)(VGn^{MZq`i++IZ);k5Kk z1tnEHM2x@Y;e(r23p7e|$-j#+87U*m6!H`jeB4l&5{ULsp4w@~ULiE01!1j|TE_c? zT6JB#p|U;46>WHL72+H7;qjHl>Ig6>A?MKZ1VTu}NLN$>^2Ody-%OoQ5b}M?(sMsD@rVw{qVeUrWd8s>#1*pL_B3zsw(cuqeRMB-`WGBQ;GwCT%0XoLm5+O^=4r-O)Eg%lD75g1{2qBh4Gdks2RRlWXJ4-DZqbnzTi{*8TX_0H8V>Xsd&s zZk$9GHj}3Ls{T3a4$|#FMPN=X@5TWDoC=~F>A!u=u-3vZ*1v{#IUtGEJb>Hk_01~l1J=g;4xTgM_O@l<}f=HSI86S6u7+$_Z)ZIAZ+ zf1FXoi(QY){{VM4!5v4F$ve-C4gw<>DdhF%GyrUs9#aa)_#g7gIF$rKJkX@TXheL^ zpHmqFB^V>)$@Js4Q2^|pCwZ)(HPI^Q#BV`Fn{}^`Ka7giQdN2z<9H2yn^LbP@q$5H zqv!to@9+fwzW9 zV}iT8x*6j)&(f6=9zf9b9Fe3w7r+gE3ziv45X3EoojubgWIsX+;6Zja6I#z3{{XlM zXuMruHa>4++5IaY~BCkAxNY; zB6m}LxltXm2ag-n{Y)U_>YXl=-tGhxmL*V$jD4rZ9ppTTrpF0B+!5X_0HxLKeB!r~ z#+ZVma+?>9u;g!1MW}6)Lw(|yfolUwZnvYq+UBWB4>1u|?cwJbb~sTK;&vW9xD04s z&>mh>hkD{Zb#DhlgByIrF~(%vQEOP)r^dXP&ZPD$MK$B%J>D97%2PoB!B1W?lWiR~ z0_#brec_5Ws4Sr18#%Iv$6~S@Soc@60rCJ6j+e%dj2Bc!TSfOP^Q=Fjf`yB}{QO{& z8&ryT54wvK)nZ2g6(W?lgm7E~wYh z6V%O|08_Zg>U;6|&XHz_y)S6MYv%wh8_+M=k2~L40wh$r0)RI7zDJh;Lc>_9i6|Z{ z^@u{jR?Gh8Q-G*!5Fk-V29s>=cF~X^F+5a&p>5`Nz9MKU6w!~1y=J2xH;`NtzUih| zAe8fb4N_ul)B!zL&(=NTm6#9|8*h6tV_@VB5`v4ZZyTPH6m?E>$KQ;WxLuH;QzOGo zm=UA66ZA`{u=9W>rmaDvApI}C<_zw)n5I={bJ$W+4O6YVDtH@r;R7wIkWU_U|@e*qT*Q(*SP2ybwEWb?%p) z=dU?NkqvnDCl{M?vF;#6!L2|v2JzRvG z3zD*}?xUS>9!)Ss{FJgK%9V(|0oZzwIlF`hksbO*n;*(B>u3m3dGxH&gW9dK@!J0YtW;(IYDG=_IQ0>2q7%{J_{O*}h`%>0u&M9!{9=)|RvXV23Ol?% zgvN!~hr(}v;{_m)B9C(**C3&{{%e`opj6(x7FXvkkRS$!Y4xu-VHO)yu<`qMvH8^R+Lgbf-7-aElca)qg4A@n1@de)!W ztK?x+^nBa`Kw^Ri4=8r`rWWK%#--*DOA83pt$BCnATGd~6{v_GzUNTu2$pOW zrnTfLF(xt+wqYHB-sINs7VG&$BY}2U+*FCE8>wQucjI#zBFkJF9@)L`7FrN}<_%AR zDj!*)JZ6HT5`uVhc|Z~bBSwa!yXUw@QOXMq1}EPA>v%f!aUV($Pdz3k)CQ0?6==|Q zI`eVWXJV}lbDj5_Qq6~?tNm+6QJ4cqhf4PE^lKP^&{Uq2ugDU#zCIOp&tidI{o146>#32G!k=Ju!Tz1t-DTd z5&HwA;qcPnGVloAWU$|#cvpKmI*e%i?oX^t+Zyk7Jw5Is$MFOcSES=9aiOeW=ihtW zMd@IP7L!{*_2(8$HXIdseZN?=qX|5}4*89)HYwA8zn`3?g=3{}hM&eJ90(CS>;C|g zxE%<3N;~BBjbo=xNn{V3Gf+Gi$Y@jJ$Hpca6=5d_$BZPRfn(mAf;HSB1Z!v|X zN`XY4J#WTKR8epbzZY3UKpkm+h-RcGhQNH^#t&_=@V>qbc9zl!CJh0X-m}6q0jKZ! z!il91^7+G6)B&2;gMW&tnAaP=`_y#>IOnJ{!%*obEogN8g^n@$Lf&%2*`Nl#VCP;MD!3{@rg2roD_PXqUm;OIni>uA3M;a z-Y^2T_8zO(&Tr@_(C(Y}hBrW_S>1yZRz5L7(Jf3(-JcW9#8Q!Z0N(S57o&sEwicex zEbqt8Mb)RS*#Ln+e!ut=7ZV&@sZX-)t-e4td@cs?qJw+9r zm2Se(FmFET1?i^#9Lj?xMMXzd!F0YGh{#1O^=Ou%K&T;8^Zk^ z$dxbvo=?k=>_rn-sE&U|Y#~9wCx_3f;jt)oiR)d(B)F!&2Z4v{0kn?kQq=tMZJ92j zl?VU=UF=-mbb^_#r;m8eE#YbvCzc*J%tTzO1Fp`$SgEnP4}R$1%=pa)S?KnsEx0L4 zb*LI@dFCW!DGhah5WK@}L5hgc*Q0>5q_QivKiA_p$&p`f&Rr3#S&mDu#!CTZHt5M2CFv$A}^u9xa6Y;Q`eW z&#(*fzOicW8R(nxIoq@63ak*p6!J8czc`N56WVPfCt%_SLLi0tSJUx^FbPTzcHCDj z0Q?d-FM>Msc`9#P{;^td26+Df&R|gm+AH^`H;Wc%)YL=sjS

=<~-TFm=vTbe;U> zmtd%TZS?;D8CD0jaCLbP4@Ac7qR`qd)wnF1vnCW$*rZfY4?fOhBeXL$&|JQmGA7MUP*(-(?;)|jpnqH6=x&A&TUfEiUVLj zX8dymh){xcROLLsc%d?YN2wZyk9+QJ;t*I36={4z)4aL0+}_yHv4g(z&hQQQBoZ4H zYD1L4Vx^H$I8gi7qZYx*YYGR8X)#3`g3&|H^aO4_FodhR(@N~?MiLMfsSSbHL}Q`d z!uEsFh)wyoPu^IUHP3(q*r1*9l&Y;;?m~9{ST=~V_$j?FCOa-Hqe=6DO*XL8)+1;y zP-Nxxlnp+J3iU4k0QU`DAfq~STfB2|hWdVS+-z4DHzwvtT>$hvzE*p26?M`+o~Hit z%es&X4*F^sQ_>>rtxCf0Z{A2TD(MNmQ8~|fvN+J%-5-b6NCavYU61(6ED{nOH@#0( z!NZ+s(C)m`R}jz+(?GH}&hgQ)MXy=#3b%M-Z7MV!7q9hzngS6HsUuL<&5Dim-*6fhTahWh}6pHS&;0nNwvE1HSk?CJf8j0YaBXeLzqSfoJz3w+>S5P)kfn9T$ zLW^-!rK3a6H);v!bOh=C@EKujL&F08+;gUz!{W@i;HF*N zsEFv@Nt0orE&70SX98k-zn@>m7|IUI?jX;1SqYS3Em!$(sfq5IsytSwG+yASnvwuI zq&`>Y9ul!s0(sed_}`2wg^pVetG>0b_9@haKq;-I?HG6{EBuG01d>?pptXN&*ir91ri}V2o-i zZ99BB-s6DKAsf@+2|o^PcPi9=0C~O1hLA~dQ_Xu%<;@Nzq6YO_pEz#_T`CEN-zz(o zS-V?J3ThuEjI}t>Xx$ARUAhOR@N0K<4p33UFL8h*NH#Q*X$?NT<&DP+U31RPCD-Q; zst~$7mH9t;p|j+%0lWT#$>_k-6o8^^pF4w*;^81i&g?ndOq5^NyUOtEII^hS|%&jVMPfC1ARQZ-YSJ5b~*vu z#Tsn+!HZY`f}5I$P8op}2G2M3o(0G4RNPgwW@uiKC{nLaqvH?@16p-w(D&yB6jSAZ zq(t>hLPY%!YRAWMRSJV@@ND@ET9n8pJpgE59`SB$kEVc)mfJjKs__UfWlD|o`0fPs z8Eu`WqR&4$X?p-|v2J|K5z6maz!lx^om?)BqoUDRT7cOuZ9ig=R5!0uWI!tklI;{0 zdbtuKK{hwK;f9I|CdBr=F}!Y%kF)*Y5%*TfJb1XXR;giBb-yr1LPr6d+aHC_J9d;-f_z6UbiuYc^%IS4NFICi3dNw7lN&q=~*t zd3>Y4JIk#MGOu0_ZuNVB7H2Bf$TxoS0!%VywvD>i?e?eTMJ> z{e=*j9uq9k2F2?u6{9pm9AbbT`r%b}7Jm7(RcsU%C=Pe8ATX2?(ub7K% z?)i_LR99{B!)j1EfPgt~J6p4C8q?1_<7+}!O1M8W#zMfnpgW(TFhmLjp*#!y6?->s#PsRjIfA2B(ExknyrS5WEaH46_j`*V!2t&MJNwC48Y@T7 z$Jf4?BvPOw^z@#;yyZHxq9kSW-}8` zprgdL+rsPLtRZ@d)Ke;yrMG)Eh^5fh#)4zyvripGq=2%sQ~G`|YCwXGAo~|{*_Th; zHaMI1_!qjlNg#q%dbjastV`-TR&qA(?^#0BS*Dsfvk^|vs%h|d;h4lQPJpKR?xp56 zA}aVm6pQ)3u`eV-#g85{MV~G}_z3YlmjH*E#5E{W>UqE#G>e7Rrn%fSQJt4un_<%r zp$yV^?T)`!e>kW>RSft;b;QHyiXfY!J?Zznt#pPN!GI6BkSE&p@!(z{Pn;qOBX#1i z`#z>QND!(7O1wsM;}TO$dTZN(6#}@M+WU!kqJaAPu? z=rlL=-S-$dC{XVKiYf{g(=6L&%WTyk?V_8 ztV8DyxsarLTorr0X5Ey4XAK)8vnR?2!tgSUJ{P$}Iy`#ua$T_A6+)L>A@AcKn;yUw z1k#jeG7u^Z+7-5zX}`u6CMi#Y*8cz(H!9r}Jw)*IUhD$MH;R1u{peEQWDj6s^5e>eCDorR4LJ&eeiM290JC9^GBn8@rDAYi3JH8 z&WSH%grtLLwJx6F0hJ;_#e{E;zDy2<0*pGN#98!X6bR@xC_V1E=45cm4L^0#lfB^K zs>qS=9V^#;=Xk^pmW5fTiW5$smLUQ>ySDsk$f3HJ3&Y#u?=FUgfCuaMrwHWeq76CR zNeJky-;aQMfIw)9@~-{=0PZM&DN-OGN8dY*Oh>RPc!xfJ#sVndplmIY`#-EH2^uzd z18wu4I2%uN6iK2G@Ari7+63C|@6~usUw$w;FAzZkKa}lq83Y?AkwR-*bIvq&dPyiIpKbhL*}xj~6p|cg>m#5P zq>0veh%fegxx@^Q$?x&0GQFd?EtJj-)}Q(dVqQw;T}J{7WWh|c@4g% zj7AIv-Twd&C(bM@*lk8?d-wjbk#g36IO$8iP2vCpp&WQ2_i(yiRG}Uo*W{C0#UAEh zeaA=2x_Ojc%2Y*0nq`~)=FSCFtt(Bv@8rXiAt53meJ#L^dA|`u_u6d+vg!vWMuNX{NyaDngO8s_4J=O zRig+ekh<_*d-H?L0trUTVox|J8?((j5QgaX_{#*5inrwn;1MC*goW6XVEHTcp~pnB z%F%5}&v(vf&4XvVppPA3nFO)W)#dZ^gBx*L&Yed3h7{5V0&OOZ0SN+~!WJdmY|t}( zZ@e5Jg-VT1S{s&q;TDE^31tnP3cI{80-{oRfvQrzW@s%2z_i@pucLl&6~JFV7t!J0 zTv9SqZ|1oqZX+O-OHnuz<=#?H6=FhYlb+DG@EL#x2Hr}xCi zJvE9C z?<3yy)H?xp^O~276NbS3R}xj&>Q}3_zWoL%)DQr9M8Y9oDk zgv8D$Kmu?8MULF-C=dbKv@ze)_nQ2T4%wwopfc>5X5vuVZR@@=5DE7i>)od?Fx}0f!P&Q45A%;m zswfx0Z3(jiE(7`?G*f$bF)<1VO+N{Dz5B<`l^^h$jhetf;qqy_=FHH=jV$%I{@xHm zZA!%1tsh<9ZEv0`0ifyI_{4|`Gi*EG%k$$Dhqqc4=dXkOV8cn>56HTkzP@o56sFIB z_xQ%$PtEWJ-1p3$Ft3DB?b+jcm^b;oA0hiP5~8DOy{@%ATuP)1Q%i?a%vZ$4+35-% zAtfDc3}?duGqe`SU7h9`n&_W8x0~-bzc^`70eaczN?EEiUBiOfV(4AG-x#P%L<&_z zu9y4DNP|(Qe)ykuWZ!%*+dbmYlONhMH+tnk~+Wlr@4CDI}9dmd!5VhS0!WY^;0 zJTtQrDq2g|&%rUG5`zyx<@?`_VWE_o2-wlkY(C}{JSky*UUXla8$m#RK(Xt4_|1?A zh*gC=f@Y?t>o_Dk@HeBq*W0b+0jkx=yEW(fesLYvs^FY>IxF!eDjH$z0t%+f^yOd- zhOx@B8M8}78cXk=SlZjZ>x@u6S*3GWG;26isC!N1CDM|TI7si0gVrWsNaw-Z6gFQu zy+aZ31-IeT2|geOgKajx`HmOBV4Xc7<7~vj2K)tPmQQTfB#=S?0Y>yfY>CeqL6ADI z6FXj4!|NQ|a7%bVHu+~Z<7(c&fush{5u7`L5~Lt{V*JJ%^W8wcIl9)v*7@b}tfeiq z@FOmbdFSVNC{*fh;U5Ix%Hk@sU}>o7Yc$98h>5CpRS<}O?gy}7 zPe+yUx#7Y4Bf^@heIv!z9WPp=rrHmmv!M^ONPS^1b~a_q=k#hWG*)`6iRNlqW?GTlhR)-C-*bAsqbZ z@sxq{f}HNpv+EH8M5xr+{1F@-{l;!|9awzaZqe2%j}n`VsW581Yrl3r?|0)Du_n?P zqp(1WpqswWCpcBL5E&`j+}ph#_mC=s&jtQBrzat*d*A;%PV`Yp%y#O?#O9AE<V08Vi6cIw z`YpQhX6HZ)NFjnMi1((qAGQj{=m(S-Oa}`iT@bAz3WF-T$veV`~ z{{R?V0;gNGSwH!e+@dhs=~yAGWHyLVY+0MEnB9W1X&2M7#r$%_>v37ritzs64$AS$f1-Q^vgGLE5vXGL}Q$vKS_ z0RWnev9@ntSo9d6ygkQeBS@qwjvu><<)a$Lg=sak-!RgJD~+}T`+P$H>JZaKG$@Zo z?y|xBjqy8)k>HQ^0Pig;UghGKXx(3U)zI+O}875wv;p?Ql@JU_uHs{d!A;X2BfOuy?+CbB&r|kFJx^ z+1r|0un&Baf#{+qlM4`9!SptC`tgW{Y$^eC`Fw@MgtdzYgQ=d>;WejpUO&cftUwYA z8`CfTW2hY(7c`Vw^z(+JK%|OAI6scz>Kww;sno?Cx|ybp3c!gR^}YGZL4^{tus9m- zXuSYr0~@lbudFL^u`2W)o;~7X`#}{gwwH(T%nD@zQ$jp7y>As7U=z{uF0QxhD1%PG z6^+zgJ=O_YHi8#r?ztzP<(N98OLf#kQ_trDby2ZhI4~?cVl_mx(WNzRgzfc&L zS5+^bZyzi3&Y%$$2G9-UaN=qKIZ7RujDIP*GDc<@(``Vvo{g9if|!8NThb~U4nrqfYX_n5 z8AbEP=Jc69o`516oE&5f9C~8PRy=0rXt7NNyi37MaGxbPLuXgXf$;t#c?f`oY{C;zU4H_WL{{Ww7 z&TRt?mnAw+v?nM{ShNb8mAA0^^K*XH4E+ySbXm$BFxn`Ca~M`oHJ4E zNv2Tr2%#JA3>6wybc40mX5+qKq=mIL^XZMWUXwN(uXvFSb_zCtJ`K1;CEXk3O}xbu zG--MSnl<6_&w0$i--m~ir?JLWm1+}cp#9GIz*4ewKn@~&^~UTVC1|bF&osQq+@tW? z9Vk^_IB1wIc2rT1Q36FU0xA&v%mY9a5`rWd#1bc-C)ognu@bLz z_%O>;$aFVkI@kMQjA$wnX!E1SuCu_#jT!}k>C5wzN?H^b#MS%C7v=3p@ViMe_W;O# z2J-O;XqIrk@k43cgbfqf{jpZ#D5^vaX?JfqoNH|K>37oXKJaNN!Dvn0bNJ`RZvOy))a_=2c3>I;Q6c0$IlqEnL63f;<>o5c zq5BX1Zy7#NBn7qi-{%EU09aQ@@K?Xy2e3*BZx5^eXQ-+^Sp=6vea4T@Ue8ns1WCXA z!f;JBALpOW5XsZkVvlF7ddXR^dNkqC#%niN>$y*gbj|3@5m3fqo{C#dY_0c!u~hRf zQ3&+!F&VhfQRWcx7aOVJY&|2VPe&L=;HemXNmA=x^W6e6I`9w6xVK=Pl*VjJtV<>$ zWz!x_!8a)3Cvt;Ioe>dZ-0>VhM??BeKY0WR2)h&4$%5=@%sNOXY@L$~>Cqq%3L(>c zuCRB)mh}Xi8lOZtE9KzKcTumSDP zh27#6^Olzelx;fH-8>{IhDGQdrGhct?}lzx51(c859;W~@Hu4`ZP({{9LmxnZv8vo z-XslC=uISd;QLI5^k^lglGnuXiz>pD982Q$S%5DjQ8p*ztfPie0w505e18~0dJ@U_ zao!Vl6Deq3`8>H*czQ=3$Ih`qE_T!4l&@*yHZg{Rw^|~R-&=(mI~}#OQGi{o-Xt;- zPejOH*N`L9xCYx z8$2hRmF+1(CWR+Y8uz|lnHPv2b?I8x2X8}SA8W3suO=dQr$`e;N#OVV;U*%fTMQ49 zs|^@B6aBEm-u&wX3h~C?{{Rdbu)4n|pS)M(sG8Tm*UOE{T9KZazH9y5P$+jc6|kD*MTl;lS^_yH_YqQZee)ardppdEH@%YQw6hN0_-`*sG1#r9{BxsHy?d%RliiCas@Ml1Tfg}^LKh`c3 zyr=n}A9$)EF+~Wg*H7yk#O21lBp{D?%(A%BMBjn=@vI=9vXQ!v2bq64T!x0hIanGL z;Y>k^as`$+AQ3~zyvelGOE=~PBc`y&fNtoZ*JW15TaksdH7Xn+sp!W?sATC)9*V^c zCBR~9C>utC!DLH);WpPh&_l!F-chmuh6l=+A6JzT@O~aL?ASpCXg*ylxvwr8P}DJC zptWXzF_=)&8}L_1`8(qe8xaS>!|{S$z^0fgfQL8dDQ*gjJac0_zFbig6BRm}PWH)g zLp3o_sJ$f9#(ToIL_*NqJQYyhEX4+)XbRt+<@?w1x^iEY#iaa`6!W z4|QHojH$SUhXd^HesDSv=nH7@zIse18M@^2qqo`l$EgrD-M>G6z2g2eq<(I<-TpDt zL=aV20W9C^I1eU`Y9A7tKsLFv=qL-JCfa^YVy;<(RaDmx(CLXLh@mF5KG(_h96->b zK@{l`=;-Y5fwe&>-*6%e3`Wx#u{AbQk-E^A$?E~s11e2?o%qzZ1SAWaq(`Koqds$V zWQRM=_-H)ealj9BDa(2tG24*u3pOyG0q6sGc6^!zIJZJkw@mO%XV9oRoF%$^W$a$i4tqO*?v#XB_UCk(uXZ1P^;(e;4QEffma-gt|On)DGi)&9NnAR4HJp1&UZh?xW}O2hMq#izz@lss{nteH441ojWUA{To z3%ZZVohRRNTfCljPkB_(wgc8v0>Wv1gXR6>*e0Ruvu2}c^O;aJ0}}DmfBl#YL8%2G zS-?NWT6)|&Z@RVKl4V1BQwvw9#0X#qRNkLg`7rKF+K(Nde@RUX zk};^}pKs~$iV>9Ji{%OHM{q$C1!*+L*#7|A$(r4i=sb$(Jh&#-sSU40^b$UIsfSVl zZI0KgF;Qb&dJZ&;P(Iu)h?R5b`bL*ho-omwAT$fmQce)ibj$AfP7`p6h$7s0=KGsVG1agevWw8b=%BTQAnB_ z4bYxD_k-mwoGC})v2FS8Nb#(;71C6iPw2x1kVcUJiECQd>7Gj@&0xG6F8gP3XbzAb z)S#_;M)x9NLJvh#UT2RPEMzNZpP8>%)=Q8!*5{5nX#wzW-;b}y#ss6lh~LH?a7Yq- z6PeEF1>eDtut2BaukRB^5dqcLzpMigg|&ff6~R=c9iB{qG#m z3V;oN1{1+x()jh~AD&ErcjTJ=;UQumzTQOnx%Zq6^r6w4?gV>ZZ{h`$#Wj>EOUY^M z4ev1C-;LkMl}z^MHF-91=KWw6+5jjE`ZOnU-XJWGTq)g}?=W22gJn9>yw~5}Ahdvy zY^Q>G=CP!>vr(cV^r5z!jKtE!N%^XfEcdQ&7xU1P!gTwm+oa=*?k#@@87tFxH zmW0sehj9{fSQq~Qqidla9{nEk8&7In8xSJ5U(QxIHXl>LywRAe2R%1l^0H%pNPV>L z&zxvf>_OY7O2UUyI`p*i955S7En%!5~%TAAXNI$;PmB zt7O#Ted9&CY!)ol*M?YBHRL<=!(SMkO&XT=1Q(cWg$7R>=__};fQTboWB1l%*xrnr zylYI~ywm2qNER3ho*XhJ#5V1P*;?`Am~9X;k`MirU@I8fzPH4fU-UVbSwxDem9$z^q>lL$UQ&CUlpJiM@!@U`@x9lBCb#h zbP@+m!Nwo~2PFX3&&&JG7>RCtiF6d*U%WnQNKLKAg!QN16r7jf>7aMJJHB8Lh0rOe z_sc$THmCvu8t~oofV&eyqv0JVlkX-7J0v{N{d>UFQV^;WM*jdg6QiJ4D1e8Ni<-gI z9tX+s_x>;-q;NnJf8u(`Ag@I{yuJDJfflHEu1dNZ-_8NN1Za4n-0{qCyFUE$B8qj$ zuCKqmjwJ+IFPF!De)EfzC?#3v`?|xKP$*9UGOH={rX`eg58`NbU}s6c{|-`4UL z&a^Y+c0U+^Vpl@0nX|3@`N&|>#DyO(gVq-Ce&H3IwwWGUjVRI}U-8_q?i4&k67TO> zK}15UqId(-6cbg6xm6SBxB%D^9h$ZX4bzY+rK*n5@ov8uX*!O*171&8&MBK~Slvsi zA3wYrg#knGbe_IuOhR-h0qh5LeOET3P(gTp5SIL50p4{h@194;tY>VvJhegJf$Mnv zYEB8*zf)g0;NkSYNK)=oUk(wf2^|wa<<_yR>~aM15P2YH7{Yz%ti zkLv)Hz|DA>X`41_5=kZpT~j#LEEjWkCFF{V`{`xMV-+wGc2Ar z+<(Jn4RISC{{Tq7T!>X@O6*rr{LFLO_Q)J+UQ85`ua8z|2i^8iML289nnN3xy1XwT-a|dbw>R6UK#iN61f_7f4d$+pECMDl z2pmmK*OcBd)hZ)4D$trQhVKd~QzXy>jXl0iOmaSPkrPF&`fBSpKou4Z-igkSjyuTI zSnz10Df}PSB3p2SCF|qP5Fug)GW868P7v*rUmy3JMlLnkwS6p2`5tDL;H*AYdvPPK z6i2?_CxYuERDz|C5fj(hyZ}+CYMO-YhvxxFBu94qCXM{yM#)LG`w8Ilh>lS9$HRWm zm;_2-t@rv(Wn<_8)5E3&q>aKpFBy4uySn1D?L6RT00%0PO+0<;W-%tjkA~F&-u-@Z z=`977F3j5e^2nksJQq~nD5;|G=+(A>G_v@|hm7~NpPc4Hp^ z9??1PDFkGcO>ERHFjiuOrrE|fK^w||)?j){9^L%s9^1_twqGOuxmXg|6h?2x+c(#k z5&+UV2}{2IejHhma8W!ig!MG|aGqr*A)B9f_v<|gMFzZSR!=&Z+WUP;Ld}79=J%c$ z+gy(di}9>^j=xZ(2oa;+=L`txME#Qd7bwo02J-fwW7+kSksAwVL$O`YyaW-Mx1}0H zZN2bJ?*b_>@LKKhH;F=&MTi3(h>~0-wnXdY7=WTpxCSwsptOyP8F8#bK&3hjPLHz% z627|=sBpaB-cJsoHo~6+*{{HGl*QQlwD5+Pq;f zu~GbknhwRUQsrL}Jpc!SELrH}uXL1v0liT+I_^juzL0E;jhi>MFPzsj1_TX)H%H_} zA(61?n&q84IwDCICK>WoS*@DbVe(yJpbNx{Vy5LPa0_y|_A%D-RpHR{(+p`8LS2WA z+VGP!m1d+b7kAmE?=Wdzf*qdQgnh7Ivqn@WfnE8Dy<(;mFw-ml0Bars36RZYU|nxY zS(MJg3r_(SxZG#4ooT935duxqo5S-7NS_NK4wN^{N$6r@2x+0=5^D1Zchq>qk=x~b zVV#n=-qi)#d}D?aB?X|+rk$(j5JU;A@KVk~U#yMpn^%eXebacPOoROo1*k+H7%FiP z1?m8N&lp|BLq7WN-P1M_c;q z;|NHU6HCVw8p!CLRIq8iZS1l0=VmBQ^@a!}`4Jft&A|i^D}EYrp|U@so3t|?oa)s5 zWHlGu$;wC1pBSzXtRZJy7Vq_fi6bD7`Dyp~&7?zAxAN{jRO^IN*2GEgHS+vo$QI}{ zc|LDECj4b-5)q6Nvt;<*2#FF<*X%yKF@Pn;L)jkgsrbcS5#&jVgkBzBtPx^WhB`Yv zufyEmj!>!UqJ?1Y?eNCBWYVUCvE4>1H6}7WxTz3bokly;66H-0E`^A(M>#zBz%PNU zh-g}2;US~4|I)Tl}dOz*y>`EncMaqyf!?6*kKU@D0dE;l8MzZ zodJ;eI9?PiJYa*Q8Ei(IU=j_!G#;`+T*0=J%VslpS8)Om+u>VhygMg|!V!zH*UlCt zD2kFjPamI*a$6C}q+Ua~h`F)fZfy1w{&2=*5V61(9XxjoiG)CgQ0b$s4k8cM1PeEH z1?D+kLU`M|yLUiY_n6$I7 zfYm-*F%F0jNbvzjn#ruOgFGUR*W~jYYt+)vNL2DT>v?+B;f`z-q!@f)Lp20zK=vIM z;|T0P$

#x;Ma_xh0u8nt#lc6fM%T(Y6S=ZJc;jWXjcud-Tn|8_2f9D)(D-Ed{ zBSW=IjGIfqPgf>2!QwY}f@A?IP-fy);(TMIV?6ip!3` zfC}(@c3h%Va?P#K9RO(cf?hI|I-nvPRGOyoWxpagIcRuy$V z$&o4KQre09FP}MPdas02dX3-`Xd+s1XR|?1BZ!gbSO#fyo*#^98lhjr+>SJKs3AKa zel!}#cPgy{ZQft->m`krz? zx0nPH5{OX^-hOcjO`!*B(yv$Jc3@!BsMxQSNQ<|AGru{4nLfn* ziU=UnqtVKwPy%hW$AYt*#sdkbm;lFMO&&Fg!bZy)&9sV?HOxJGHrb*3N9tsv8KEkn zbwwr7g|;btN>ferKC^6CdhQfHLy3YP*aYnLg75UjWOP9ii|U%uPX)xea0Ze;Jvofv zy0c}{o1NFU1u;I@jt<&A+26xrMtC1#cYjTWC2=g1BVYj5r-%2H0)<*dM4c1qo{W6j z9a)U%=xd3IuE5AhLvF`@@}H8IQqxaf#I(3I3>$a_L>3QAjx>yZnQ>Lo_bIF)o*V*J z*eD{UePnO~Ik6_=chJPecP9;+*rrugXMEeS|s`Go!t87v#=KShJ% zj$R_{ihu}R>vtP91mFN`soD>jtP*+)h09P9)3Ap51%?t3k9t6ed-ZZaok29KIN3bA zxNMjZ(VEZ}c?qX;$@-217z*S$r^$`;Y;UDZ37eWhuNd04TusEw;{O2L6kWQyC~5fo zT&NN=&Qh#(bv5&srpiS&U5!;KNcWD{lPCh$47M`IlUTx}Yt@z!(O7jKIUFH2Kw*GJ zKOymeLQ3xURsHYZ-XO%Y^bBpi8YRIf0eO$7MJ%5fnidpP&=*5zgw(ebqNlRuP!U1! z;G9uH5!6-Jj^YvN+6}f34k>P(Wio%UxFkw9_||KUm$VZ?5P0))G=L0Cv+R0~rE5P)r+eyLQV=%t97zmfJoHCh&U{2B! zx@m%Wy69mw3(f)A4d)W8;j}1hc)KySIRLhU%M0yup5S1xXgwR`^OG^Sxa^?tYfWJp zURcOD6!`pQm1U4yAsihaISHjk!v;}-FUPzja1mp$Y)G*8iq?Wr4I4Zr&&;?GfDAyI z*~a*ueB;nV=$O+q&D5VaAcCl56k_Y+60dkvpF$5)UwGGcgN0B;TCte8dI7RgH3iij zVHTcQ3XHxMBv^9uBouhE5Zcp}_|95J!#B3RxAmGK<%<;1Zs(986$!Lnr`|QO5mmE@ z?F&kO7%@jHE#v9mtSMzJ{L@W=Bj3hN0Ky+|A0Cn)7G-nc3ThsKy%W#gCY7F~BkU)) z=4DoD%?Jrs1YsYHqxwk)umXUI$2~kQoE<6c1<;oOb^&b7Cp>m@TF$O`9kD^7bpltI z3$cg+VDJDveR3ddu#KMK*Uxuv=U zwlpK5?)>i)BdV3&ihs^)U_x!=pi^Ad{{Wl>W~tM}W3L&ASBgLlv^!+K8K@-z8!QuS z^8*0<8X@AJeE7-a0JLcr-IDuk|)jL_ai+KT1QlYmGj7*LI@H`(M?-634L5d1H zig)*5|-(H1~$m= zNE->+z3*8`mgsUVkP-eTG6pGVs67)}PXo-XPb+8#ZzBNNVHLvj*HVbXtgpkUs)7^+ z2hO{!yoa9&f#CW!;eTZcO!EOyhMZA_9?(=yE~PYh$gX8rEKi3>yVvIg<9I3Z3+*|) z8;SG~g>(-a-i*>nlM+U0)dAc)To(Bl?qAqomZU0Okw#EM$2{ZabTK<0P4*KL*#QpW zY!Q1zy~KfhwF**t`Tj!}ic__t0~c`C4HS071!#k#2GFIoS^>U3J!ZL5DpG)=b7su7 zlr+*5CMW5p9<^BnZC`UInQ)>$T!PNbuS>X)f&vbZQ4B%Ztz6pzrvhSgzWV7hYY7h7 z+dxjDJY#SujlG);L*XgBLDI)2+CHF|%ft~p0tmVzDsKZFsB)nBkVjY=U+rmbzlt86- zXH56cyq}J(cU}j>^I-1BTOP`2kcB@U z90x;?dIz^ARVYWgses;`Z^L3<+N##-0+Jn`aRgg2Frs7y+)pE{7(zBQE`%bHCwa__ zy@We-QT-dO;u9sdShkCIK6UeoVv^N9r-$ALIKYDqBK}>+LrGyYIuoap-fL8b!unmh z~qu<{RAbfDNMbi%{F%$u+wFNyorL!ZFg_>_g9s|XGFu-Oaq4f$-8{nQLk~Hnp|nb(ExD(s6l=)9byR9X8=#oG#O9l6^nd< zyL=kJ>;-U+r1y`}leC)938Gmzd}3%(A&t8mcdPFc(xVA%T2PDdU1Ku4APXIcCc$mo z%f_c}xBv>{@?Z!OF~c2p-MuoK@(o<5{{So`p5V2Hf=7lDbLyfsk`il6>m>u#5pXda zx7I};he@|k1EXiWGOL}O04Vy>wfpNTRox>(v9AVPShtPR*of<9Yw;x1Q(r;x-r*q; zb_uL$g7|vLqJt`k_HxIkj8nS^8e^4R8)NV`s$CPTGnc~LSlpyJqAk{zzZghWlv10K zAWOCZtl6KWrh~|)^nuOdHlFhB(9z#7ekM`^%Gs}^f}}Xg4*;26L{w5ThnQY$;2aVV01)(FzGBK+lI%o)ynb_bTisBgB#rUBCjA3p zonM3_}9(dBrp05T1IImuI{c`(lpT z@;3y=M9>3TLAB{Xl4g|lNF!L+VHbu)f}EVCZ!&`(}*{{UOXC?>pv)uYN~E>gpyJR54mSHW)kYRDIU9uv~+^0QuxHv zlL)u5YL@dw#KNgnjVWGJ#@(H`wS!PRl%28GlYGI>z_{1|^0isT)y-o7i$HY0R02T; z-QTb|bkrbX4vj<|3GWhsFqAmeHf-PIxfRFm=VY%N-nC(fr>Ni;LR;leA9xyeAdvxh z6w#`<^aP;7t$ImeA9v1ZZ4;1{FMcGen{2!Y3KH!RWTy9vkQ@pr6;#obI6kkB5n+etQ?{`=Nf`GLEog={Vo=n^itq>qhQP;bI z_UAxKmpSx%n3;%j4+5OmmneaJy}yhQ)Cfgqa@o8#pg^+lvA5m=poQuYG>b*6%3zoU zoj%3cC0{+o+)`S-a)X-Fd8PNoj)GJ0&T9&5C_U4UhjX}IUE0%tB_3VTj(`PyhRW>| z&^)*d`aVE60rCggglTESX*v#3baPmIDD^TD)cgkY4h3kpO*Xq|z~9%DC#}TqlVQpl zIa`TWYkFXf5<#E5P;l6#H3<;m1z5 zxk!{mHa;omDJhue-Ae&QpE&UHVcK1xcKPv|w{GsC2^5#@g*3q+cTHB=gi|1 zB2S;+KC!tmzET1VuG-LI!kQ2(K=w6$6A6yGME?MJYP`5d+70048S2#WQ*dCZ!GPRRY?WklS;zNmPQn>XUJAfJ=QRyhLCuR29AT- z-wgqWPc>K&l2+4fN{b(sp&p9goL_q;=0H6zkng-babqDBBEdx|$@h-Pf+5jTlq)(i z&(0dkA|8gncu|=Ms(Z8v!+ax*F?eJfsNnM6SlN(=S_;u_fZiUMLD59{^}p*GA_iWV zY96PHzZr6UwIb40X1J0=$iP`NsctmF@VLE&)u2PzMsBWeMyHL9fR46qQyJg_z~8|C z0NksYKDfup z=+>|62Tmp54TV>&zq}lIw_Xx4T84SR#=aCVfplu8UEt+!7Q^wHKX}H{kx1PW_hvx! zUC<|_>uP4Zt4D>teT~hLF;a=Ytzu@x6H)>le34D*#tI4KCW5+p-znTcNumqY2wfvr z$KFaLco$vQpkDdPDU0s`^5s@MO9K$-2rX(J-qe_>EFoiT6=0$qYcVy9kws7vo3uW6 zj1&F|P*?^H+;qwa#&pU#VrO1*w=vUt2TQ?e$=sZB38$iXj;F>!ML#ZS!SGxPQS%m2 z_8N0u@zA`2itHCfR_|$-BavC~UOYYj0Ne+ZbkuB58oNCAEUpny3Tu4~n}BL3(dY}(Y<|SDF)*BPfNe!85A||(yy0J%kiI5Mz3)XKRfq|EC7-X z0EJT1u1J4w#R5f2XuO$ZaLRljAlS2)&w&K;8U^+3{5yG-y}(WBLE+W9tI3RWN^b#j zK;8TIg{F7_K^3r3jVU>d0QCz(h*BkEMg_}G+&b=23Wt>N zG|xLQEY%B0Fv88eaOPm3Edm-!B1_|&#XuFt?%E0R5-nX~WlCyY>=X`*8}A2$amLTo z74@4idCgmbi9C76F;=dI!5h$d;miJuGfT+)VVab}2oxknhF9c)U2AWCx>8WK=9qFOef=q-F@V zE6fyQHi;f#X(ppk8g=K~#*n$Z^E$i81^dO^umo5ac68TtU_jDmE35eFO((`M4JWe^ zHk^@srZ^vhPSTBt21t9s)s)!RND(o51gTn(;+N{oGIku~4-4$NLOXMFJFtovW2m%2fiRU6EjJpsi+0)G)GPe}e=1E9T)%T8U1fXXfAtA3$ z2(ue@@0f(X_J&4O2skl^L`KKs2Mj92tTsloW886i1#dO6c7defGI$0jzfJg8mpVL@pNY1X9Sc@h-{*GQO(2{#O8yypWYiq zDvUbTkS9-`+l1D#-F_E_tA-=kuoeYLs%X^6+==#!9nmCxnCI#eE&3o5Xvb@@-A8t| z{yuU<{pf{+-6ot0EwtABlD>OaHBqS>TSomCX^2w}itD4$KRKo_yaSxU-t!CL!goa{^OG3a?UfKXOBHZ<|lI@W4vy1K~FAyM;pjvAp!^6=W~VX0%O zI|ogJ;$r~7XaRu^9D3muc#3rfz8^N`*r1wmeS@8s0mRru+NSUFudFNw1XyMH7W>qh zw~3LV9{oP>+3N@*2!TBTNsn$gseGt9k7Jd>13Q`s;RuBpyPaLJjp^(?C|z$R(Um~? z9(%0RW+gN#FH+Ng8N`u6=| zm`VY3X?GFzE+i;G4FyCmqvw|y62K(@4e&m2evc&&Q+45go1YATwy)4rSI4IUmDu2L zRAt`v%pzzIQbhnmO;ft_mQV{N^hEY)rANjj0b^5D2&-nbOgM`;s9uB3v{!i~Ft2jD z&@Dd=XEedN;lMOEz12@HBToG*z12daO;1_r*4H3jcpx>QEpW$%l3*Gfs&8{4v2eul zXa}zj{;<-{1gC;7=;)AsG6t4MwLT04>V9%VD+mQp~n)HOT5aYuD$`oMnnjBt9A*e0ad5p%jc~BzyS6=uKvzg1b*4;~jp53_!PS9*j#4 zkkZeNj6WGCO$0Qa044TfbW9*cR*fxP`MF6}!x_4lkCPn}XJ`!?QY09yiqU{y5i8tq z22k5b@U?$t9E|`rrKhfmX&f;_f_NQ&j=6pqO2r>y>BE!+&>^&4JD*tXq#@mdG!;2@ ziO&bOAofeIyle~tkfAjtc>WBSA{cfXZQ)U8ow(tea06`;Avf`jg%TS2$46)nc)0Y4 z5E8&cONiG%2pu*Nv*Gy7#Q7+vMOU6%P2q1qET^+WY+fz^7ceCpKzHVISsKd%jGaS) z9}489sjozWtNiOUqObbc8WMT(%;$nqdY9zy)wvw$%JT640O*ct5O7h5h}agvBUX9eTwzCtO=l_4sm~eo*oXd9pu@ z41hjcI+~oT(qqANPzP?SX2N^GN$FGy)3EpDhCyc1&tFC~W`4`S_?)U&W z`grwBKth!Vfh)Ex?kb&o0;ST4A02?gdWYE{mt|n3`_8IC|b<79NuRe1Moxn<4bm^OdhLBv1pkufE_X z8?L|`JVY1PUqlmCK@c5pSznNXL9n(z9uj2!V?}IBq5RVUfL+w726LzDCfQ<@G=W6Z zQ{xdSNDx^Rd_jFnjR69|X48RR9bF)Ay_9sM69 z-aC0?V@a{=>ZfwXAsSC_c7^QbM5GV_$K~w<#u(QKQ4&}i`1|HFop?~!)UKPjYYYPf z=>p+`n(cZ`arDmFHE*N$MCB@|gw`M(>@z!pWG106Hn z_kv;?@{+yq)W(Ln27|Ty(^w)*C^khjc6m2nj6{osqAs6Zd0R{$5I8Bp-ni`ka^s4S zJ^=)JkFR))3$!6W8=_)%QjU>BsLS&C#T3v4LDGx5KK`+ZSs_Fimr>gK)&)L9wA5Yw zf2>Af0S9Kuw%^t;1=w_?1mD5Fed8gZA50bSdrf?EC;~@DjrE8>$1w)g83UzwiLn=5 z+c2j_gPSejGy}M6;~^?MW3?Urv99iLMW}Z38$6gy5KE=4S)0c%F}veDf#QENcY~?mZQ92`~<<@jO{vuq@Ow(DU#$ z%#qZ$V^N$Wlhy&ZHaXWsEU)pF+0x%=V`WpxDI7Cv9NBz?(Dd<|M${%6Md{`7>jN2y zN^Bs=bIDv*jEJrW3kyg1!4yJ-V|o)>+GN^H0CtFlweIBq00h#zGfA*>dC)eYARf@s03QsDjgNcL}`RZ~%KJ zC9v+r_|3Ny;1R^%w|D|jI5Z?giL{O>KLW)00fSsrL6xSZ1BlVEQ8=(2-n9C~7*erf zfShTcO7{U+!kJ2P*|YApM7_wM#G4oCXF>q{V1%4TQGl&BZ<^L5fR&Wkwwr6` zw+F+UU?>nnVyF7c384WB>v{|Najb06mbh(gcmTxl+9rp;aetgRl6FI;MPaLD)?YG| zGMxi!;|RvCXN9V^tFKzf(qLQxV(cjI&K0>pNZyRIzq~U^5|Z-TMCRWZ>sbgzrjPRP z_mrC0I|qUA{$Dr{rKX7w5a4`HX5I;3p{nw}t~O9g(0q7oPsodo0Y;}tEGoKTh0}%b zlRCSG1n^7@yp{y7SINCT`;Dw#QsGrUj^o)mkAN+;_orA58#SQQwn!7;<9j2c@Ots* z=O{2XbJ%Qby_nkx1Z)Tyt^WXwx6dlN^)>!^<251MV)dd8e!SuuC50U#B$+ra&hHX~i{Th?!~0{GPS39sWC2O28+=m1O=7mtNP8|mKR0y_~m zP^~rj#P5hSmjU1B4&CVnF+*{6uXq4)P6fPl+vhiw8%hnMYwqD*!I*o$0{HXi9UD|Y zqt{yBoIOiq4Uw`48hYUApx09(8+`gE0`$Hh@H;W09Fvd_MNQdqKDWQ6UW!jW&a$+` z1E49r`I$4sLEG--HT+}(JP$$-SkvUflki|RO#%@4$jZ&7PXz@6J z6SYn>+7DspxFqszX`-Z%?#=nlTGYqv3QJP1{xIJ2te1oY09)|68>?9FQ<6DtN>3a} za^Zd~J>L7rpb9wX`awDIt@943Z_uo<=j8tY7{Xy)n(ULnQ_tnbouPF=AbNd%vtOct zEMO`J=JRw&$ z`nf`5f@Gdjx_!G$SG=zwece6p&NMPK6MCxaQ}4boq8>yRtY8o}#PN%1(5Sb~i?;Q= zCkQm7z{-@JO>*KN;08ubqxydtR_-QeM0Pasa@azBiKD}%ySUhk0P)?nedy*s(>fZ~ zw97wuDD2M7Y5Ue6fY{5Xus=VhQi18h^a;-%ahtU3r?%(+05B_e6hVaIxZ}bGs3L3) z*L_SZi_rTCw`uNT6aJ4xo6E{`SkMh7nmUOH?_LZ;XQBv5A~ii{O5Eys@DYVDXle$D zu@w`aGa-CFcDI(voE_Bj>{rKyL0lWnLTsI+9Pqfyv zg)LEp*Lt(8vI5o^^r%)*uy%p;U7)X!<$6p_KXdVS`@qs#`MV(rD%1l7OeJ;0y zwRT|6xru4S=BysJim5{v0`Qh&!t4 zU1{3lZvq!LK&jo`ZprT;$v%(=(BBTd;yChj8!Q^x7hI%Fm^D`wa@ z9xjg#T4}24{SZ1n9d2`o({!eLU2y?ozuSrB2dA+>JZl6l@iv1tS(E~NGKthSMdS}u=TPU2M{W3A9^(s$#-GI6Q| z4e>mlNaxl76o5-!8S9LmFwdJ(V?>Sb#IKWBM0_No1xlx~8u`jw`y`mlzb|k2$9;|M z0Yn!_kB6=XMbTlU@X&ewPUH7F%^3y!Whl+A=j#XDU6qOD z-l0b|GB%<<6V>`+^0w&TM*E(C2n6|X1`!aD^9S#|!UOG~j)=QIquv;sL_ILnr=Knz zsax}>lUmCn=!I8n?0FtxfLc1++IjrE`Aj$j4bA zQFY;emN&@}NBDA}$7%frB{3;Cv21>_!HekL{&9MWL{yhuHhwU~%zZx{y?#9NG`gG) zpam(tcexP4Xi)b9=AFssh@w5Rfc)sr+-e3vn2dvHOVmS@z4w9*4^g30e&jv#-db-E0)m7-zH!0pwMEhD zc79hbG>{WqAPKGboWvpFa*fpSOTKu*ii}iaP>d|k1M{MyHB<+uSoVym6xzORbQ+o4 z+$w^B5I&62+QyV!{2M+l042In=#QhZ*Tx+K!ZGNmkUp|Tqax|3&pYOzZxn0=U}_+M zbLhLm>30Bb0GuH|S-2tTMNW-i>%W{=;%TYjqy+Ez+Tmoh)D_s>HT3w`tgdAjOwU}W zH-w3#B(#k+w_Xn&#=s>L5;|t+F%9)d6Zj_21FTG21TO>H?AQuovaW(&!rEQ=W;Ad~ z>x_i8H=1cMPX|C6-p!u}j=4Rsh)5+BuymcoKpEL* z-$$D;#X+`&6abFVqgUq^EE|en22z#z{Nq7MZwPZrCGY>M*l11Z^@%zZBzPrh{_BRuyYfUiZk_W3(2~uBx-eZQ#;_qbsRW2EbNaz_NOJyp zQ1y}2-v0oE!_soD`|=YB7+$dbxa+^dlcNvg;{pbs02BDlyZ-62y(gj?sJ{`!GUYUaLZ-1tMCuCkrGT?7~-zF&OAu%PZ2Mwgra0L*t7!%_JIahkUO066fT z4DPgW*O|F9NL)@e(gW%Vl$FAjN~wJO>r!H5w7MZwJa>jwi_-r9htv0qwWQYP!u!Vn zK^w-zl@{H5%7tu764wTvHfn1Q%NE5&B2rB}ePTirI7}pDw^@Kpl%?0JF|$03|_TMX0i>9}}3gkQ+M@dUr@=J}$ik2Ypr|VXBQmK0%^rJ1c$O z1TFgv&;lcJYJPA!DvY3r*e?Cqb%3JYizl^of^?R>)(=4dw`>_n;r!wlQ)5}NYWa7z z;|P`PoDw8x-@OVIzDHRQKACC$D&O)SN&Cs5)4QS#i%ZR^acCj~|?YLIJRz6x%)TC}9S} zbK%6X6Tl?^AZjDu8D%5Hh(rj5s<)2Ij<(801QOHNfZP4-h!)o9ZSxOt-mwESEG~fE z_;vT2>A?gD?`#gYS$F}V0?kb{we!tl8NuNpXjmLH>jXt4i>`(*ZZND$MRcM^)#r== zI07v?0paK47>KDm)Ypi4JZlRDsxQb5M)=%4Vj5diI}q-9KPIy5978}~V15srH3Q=W z_dz^eWTJUsL*g6pymf-Gh$mFi{BBG^bcaPs-%rc?!|u02cqqlBht3DyNg^(yJU)DR z%T+?Smhszf_{2xrXtwCy_2S)Ooa@L6KsqortK1GB;Otl}>+WwhYeGMO1E|#Uw>U~E z2Xp|s6?)O*J3xv6()phNjrArVY*5l^a0jXpSmX86sF2cpWe90}Wri04Yorn)uC%kP zWU?YKn`V&^S?=RS=r*k->K+%zTvTDs8WlAS{{TyenaZgT+z2ks;f9f#D3rxxL+5Ny z@-TzKZ0SO8yTu+UP=O7a3OB8I#W_j=6zJ|#s&9_)8^T{L!9o%5lj9TW$+rf)jd#`( zm>2H} ze)!b$%tgE+mNLu}V?HsPIrp2|9qzJCtNiDV1NVXk%g>w=G_U4Lg2qh2B+Tp{{Wc8 zfUE!o(ojmB%C<0ao*f|15}xwiVlKutyEz|bRecgfQdPF`^YmbGi0;;wLi_LDNd>VQ z9VOp9`^#S_H)-OY81lOrRo?|j_gGOq)cyo>cUy9R4#>I(Q?>iYO3y*N0bM)RyX%?Q zD0aeu;YZl6A+C1PE`;TLd+rg?8WQN8=ojbCMR;vT$!4L)^N@w;2oB)&@A-PaQBXH< z9%S(T@r)r_uB6l7kMoP~slE3DzaLoe4&*3lRAJx%?(^a(0Xasz1uEjFG&KMUy+Jg) za$s_V3uuGKe|pB@8Sciw2ar+P;r4@9XgfE)`|3=BRXWKcI1Fm+51b-aAjRWJ)90Z# zGhd43K+?8sg4X-IEn7!o`-pL6@@1r~Yy?=8yEJ>&^BGczlmu&P>Uz-%;WEM;N&svb z!Aat-I(c$@3XI*dczkaiz;hWYynvP(Ej?kHoEZQ!MG;UXo?K%mFa#8d)lUg9{Ti`5 z1c_3iS=^xp20|X3booct1`EL;XbyqUx3X^;Gbj3+`Ifw&S5LBA>>HXzWYdoV; zZdYG~!yCP6he-{6w)f(|3Qx)%aTAs}6}d<#JKtL&)$hEHG$tyblh(waUT||<(^As5 z&tsS81(~!8vE=h^*z+TS`>GqG{W3m+DAJk~3)^`4$HuL)zb^0XiaOGyJ-?~@6ED9ud^T?eliTne-_Hif#}cN{k_*MlD@FnX>tSjfT^ z@ww|Z=`}C*JYmy-zER;0pLuGyNE>U-G#`g4gcN`~C*fzjvfdz7DSiz#_GYtXNnX(G z^}l}@-&(*-WqdyM=M+b909ftebZ>8rbIn^_C|-64jKKPEA+(0LPvOWq!2whxcGmjS zj6SzKr{{OmH-$%pRoX{-@My`cX;5|!uB(k|^{AJBBzJzWw)2LFvc~vx^MSY!RRgdl z$6?%=Hlzuwd?(+mqv9*p@F`9TKUiUcgCr2{*TvU|EoGsN)!iSNwESW4lW5;MlCKj+ z67y-4ouFvbx6Ta|MhFCHZp>d8#s_ev70uJ5bJfb}A`GCHMV#@h1n9g&$>9$NruQn5 z1_4%!x`IwKCXdsAbzstHbotA5AdxaiElqdByn4rhakUf?NM~N;_VP13Ro1lWL#%2= zQLC^e8bje68>A9yA&hRZ(0jr{42MiW1lT3;PGkN`@61G+(+6GP9M}a7+X@mM4;{lX z+}=WgB-_F4>AeiMbOO2#8`RG< zBMpUAh=l7eoLhhtVrinqI^@@KnwHF#!Cqa`hcT*^MS)-m#~hF)sn3yjyUt@+Bt(_q zI;K*wm!sfM7S-+3?>ha^YiH;5&;T(-^k9{Djm--bAc zjM3bIb#maP$2D7wba=j8N{M*fpZS7B4|I>-P!iZ^KLr}D7`SvygrPjJ>+ze?`(ql= zyI(r)M#~64z)wBYn69F$8c(g^w>koT?HXZiC|a6Jv|iTnQQ>q(kV+ zx^Uh;QyBz_pgo`V@lXnzzvnc%NH1V4(opl3C^{7&8~1kZrVC2F`O8tAIeeLKI+JKX zolkGZ3~;un6>!^{VbB)0fCY6lc`g+>(Ho*3$}V{qIl$es)~2U%5Rd|sN8okk#M+<= z->Jm<-c@J7H5-wW*74wRaH_jQcfNTtHDcZoAnC@r<9XzvT8z6cg2K4sYF@EKflr2F z<{H@L0iyU0{N;^+2iqjHZ0F-I;sT)^h=c?3V}p8CBYFjomI(+#?!Dv>$N_M12PcZYeeUe)SZCA;yHN1-Nwpipq$1Qjq_QUF4z zH{P)y4%FbNv9@TiJAhro2L+8!Dg9t_%}4=4?vF4TaN@Rh05#Nzg83T5X3>$bZ-vF? zwTZ?GmFg%5!?o*IBd>0Qw^nKSDKTSIP2WhAiQw-ZwrNXhtVzXh>nN~lWl)g=EWLC$ zxiEmbkkD$*{S!G%=;=Vqx+%t*GS>?n6l^u-2-MujHt0^#6yh%!tOmnI#DMR)*j*j5zka|Qqa$HP=uz9#>*PK(=ttY*FjDE~Ud$Lc1!r$jNwT)LzLDBv_V}s@+5&YoMEO=oiYHVC6+y*_F zqZP@GaB@@AiX3g*{bG=VxFDmZ`M=&EBq0(Lo`<$;0JBX%JQS{PC;I8NSY065e-fcvQxYM@PZ@KPM}k7 z!-XCo2J@?rdNB3Ojd9`PS8~eEE(#(VtoXqqjX(+I@T~jZbB9yW7iO2=ad>~N(4LM( zMDIY^0TCac)*=WwfZ;6Gy&w7of6)4Y+K-=}VsrpRUE6&vhj-@^f~8}g zR=zbb3qDYL z634V4!=D7?IgRIKRKA!t3Y17qIYWC=kQYuL0lsq*JA|(daMPo+tE?<}EKyrVg`NEu zC_$A9Ri||G`|d^tng$_G+9|QFWoK9rfP^kJx1lB@nKoU}JR`=$Usy}OEifT7n^&U~eL*1X@wLU~>Q0=@w&z3jy(n-&WSq}LiDaR`=zRN_P(H(d3epqsx-@rl`_HsXM0njHoe8&0JUmKS>e0C)sr0~I`Nx-iGg zQ+nGO=dp%n*7K9pAADNX-ypj)MYA5rTte~BPVBH_(qp{n={<(DF}ya+wh##XJq`l=*Su0ekBXgW>$;ijT4- zt-yG{=M71HlynR5pn-&C8i5;Erty9=#d3>^kc8poM<#2pgQaU#S_6$DAaIh$u}Viw z#Ws)x_5iFAbh@0W8Og?QWkw77m__+cCssrgV!*q5U#^kBvMKD5vyN15; zbZK|D4}|3IJ1Af) z9c+_-zFg5j=!m)h0Pc&6tK2I4H0FD9Br%lripq^jxiPs;j z@U?&wcMuz0<1Yz>Z+Elf6@;bn<0!j_tTr7TN8>JlccsAY_lg(A^ya@+q5BsbU7h!h zQx=15q%4O+%&6+^R=yD>^G}>qF3Y^7#+;K|!*R~}EE?0!_;9T@etS%QQ(5oaL<&&w z25L3H+G?a-s^0XxH;6O?;2i!5!)r?U~21c;|k@W5vc|K@Qg@_bK&A$Umk8Z ziksMYq0`*@%|L~b_Xjo)cYj!?7ZP-)>_$zj!RYN)fa=TCA>$fpPoeDL1B(=eW-$RZ&Uih+ezH_hH&tME?LM z^Mu(WD)-(#zFfO60gqOaUFeIOwUp}YdSOO_UK&}-C$iDjPAbrt*0Vlfoct-^qc27Zd?$i3l z5+J)zUU=|(j|3epy`WGXKpbl)%guH3ukrT zZlM%5j_Nx?p*&;cidr!_R4;@dEZv11yLn%&Pgz6k!V)UeVg&h=E-pkBOnKtAQ zrlyF{&fKWu$}{AAf;>BObP*a-BHco;B-fm5k8i9>sl^`x=EvTV)&Ux47yShpCFd+*ic9_HDY&X?W`Y04aAJ{&Ja1J`y4&5}@K3LS1MWOe=O9HQm_h`y-yayJ z^qPVQH}6}@08!ncoF~uDExdssSN48+g8JY#LVnm`D8zs*8sXUMnYw6Y(u)II*I}uY zq?xiFL&`ZVqKih&uNmjN$%V!NdkI+YiFbnk07k%~l;K_M!dme_P?Ds z(24x`^NCOl2}J-c^qPV5k;9;oSJ1BfY{gd;=%A5Tdf5IlH4%WilA7t-Vm2hCC(?~h zmIf=rP@yB}JX`q382Lj^)AD(L25)jlx7%s0_u$EurIH5SzC1WP%A*%Rcg;$>a8B=TB;R24qvRa@t1g|heYNZC+cah_MFkir`WPqb{X0y?kd|1Op znpAGMn{ZW!tqprg9qxThm!QxrAV_yShpg9WU^12INg>@iex!s(`2keWXnk&+C|v?j zO}hm7W|5qXRG?Z?cMZ%zl9XIBkl%4j(?Nqx#IZqa*7D27gMFq2=&V9{xPh(f_#k3=4a9y4Qnu5-`;ZusL2I8^3rl`MTT(&>IDPV+aoc3ciPQ_3k*EbkOpz zWITC{!;I2{PTl_3#O4LaBI9A8d_C_G6A+;_-`~spU;<`Lt6z`#c$7Z zLZN8sU5AIA;ovgBA2tFnhcA>yVhIOdSK~JMFl8Frn(q2PdDWy;02GJ4sBp`Wu&qCSaA+%}GJ6{M_l@$Bi?pbZ(E-B*?TOV6T}P*`T0p6dfCWlV%Kc#d z+6mq;DJj0b@LKXNQM87wu~G;rmW-mN7?(ne<+{rrL>fmtxgh-}P*CUrtruh4KAcPm ziiGjh1J3B)D&WU}4IR>M3##EA@&n6akvGbUVK27n-v&Siky4m~8)c|XGi9L!?k_+I zX!jka>eJ3EkR5{WfI4E1mb|NgetLo>%iviLAHphSOkvy^Oj*{ z_ME14H1j%3VFDPUX%4F)DS4aZqY(t?p?6Y&m1k)*p2uW3ZTMyx6X`Q`=vvq;N5%;N znk`@ywIFkghq%U^90{aNGkeVid!zdJdH6g}$s!@Q*_SP1#kQT$~1A9oW$XYUSCr;~U%f}Svq z&#ZwXSFV`nvWK?}Z+6%*PZ`60Dw}`q2w#DC9SzU>#s!p3cJ@x5bF&At=T-ukwq;1#l zCBguMOYY{6_nOwFbS~(1-3;;L6H_Qa15>_h_`^fggkP22^gZ>JG7wO!z3W=N@sao? zPkkURL^$N)CqUnrePy&Vp&kHV523fNoTRbq0N{zf(C|}vAvdvn4*I*VB;F9F+id|_|%S}uh*0%>+*`+ZZh9R~f zWpn{{rCF&yGh-luAHV$7$~a{XnayDjBGj(dA8v0&VDfw zp2YzXSLjM=Llj_&K&OKHPE099G`hSbUo`$Uxw{HR-HJN-p&9c(XbuxeA#eH z^McO0M__}SiGeZQKP{qR9A(f;4Be$g*S~nQ zK|^;!6e<+RMFg6u#nt^VV$uiu zbw|3BJ&pRp18v~(_nHdwp0a=d`EXhk2+Tz`0b?hc{p6rDYGQVXFQfHL0}x0Tqvg6> zD4d>b>Uald;I0&Ofv-yq_yd=?oES|LpbfeXes_h)M4DjKzh9FHg}cgIIW2N}>S|~V zwiI6evXD$gKF@*8+v6&cR5Y@2;rx8_6f=j70i%)9w)n|MRT13)7oRBkm_{5pUWs+3 zh)7XR!@Fy&9K%z!fI?9_Z^p9OPYg(i(^xOZZu4&YC#%A39Sj+>3F?wyqxK6`ZV01H zCe1_`SI4R66r%z_S-U-#RmGH%L!~12zSd&VPKqPA4nHC1c*+w-7yOZzSR=v1E{6OM zpElqD66#4iRCs)bLsyX(M?lctzl>*8ma;l(?#;Wr#1kPA2>E*5AAfm%xR&H#+Y^~b z6|g9+Utz3sDHE7*XU*(9CNyji?uf(s^}xlbstpn?vedpQDp{=9oZClZ$Z0*edbwEOM)e3mpBWc0Jx0asRave1 znJ{@u7@T=zdvCbd06dyN>7t-~?ZpLReWzX>2946F;59Ab+i=2r zKvqgerJI@@FW?mdfTwZY*St{_LDke~6J>4QA`{z9Ukw_!{{WdmHmq#3Z0yqUm(D8A zw|XQ%(!|qUm}pFvw^}Sj8+@)zZbC#1Js$4erNTi!Le0Zf17Ih3;R*Lym`;L{wXI{k z2_V{Z0CD(+`;kbYDInF>qLv2c{Xf?8O(W13%WXj}y1Myq^75d7kqQmhi9rNF#IPlL;0%th`&NF_aws^9A zI6yo}B;Lyd*XI$%L(LY+U%GG%( z^NiD9F2C;KrF^gjP(V^{{92g64OIijqDAzt?*>Shv9Unt<+E>Q5~oOwE5E<}n8kbv zQ7OclU^LiMD5A8EzzsZ_`%T~nP}G|Q zL4G}D{mZNu(2BpC;}ICEy9dc{#GW_Y17{iugiiIq8!`p08UX4Xn)UOFxR4}2GiT__ zqZdeg{HzLZ8e~KZSF!DHU1qhVaCi{*l=}>%aDLF)@{jHSZ$Oa0Vt2}|uSD8IpBu)8 z!331r8+)+&xdg5XVsxq}KCywAQ4gy^v-gP212lPIwNGX;A`3&=O zSqPyT^`$Kwd9olMbRVCWBr72gmiC_Y~c;@qQuoDgcE8o$QyXaUu%l))Yw zY%cNYl8DgiXaS-qV<>BUlo2-$)QFw9GQ@rhR4GMHkiE@ALNWw{q0nq#bi=f)2&7BW zJ#DiEFlZ4gEjx{g6dK#CgNDtOZ&tV*(Ez!t+$hmrfF@HmPxgCA1D+&1R7j2oU^|Z|Yz|iQuk*?w^e1P}W1bi#F`u zv3W^$0Anab`TSspkUgD+(mpHW7lB8!TTs({{i`O7gCKN3flW?y#Fd2dt)j=>ujeV$ zQhosZ7R2t-kQ^M%Uy^cV{s&19S!0r#O?- z%qHz*S4|u8*1mEEJj@_=?eU}cgu($8=6UY>=XixfRlFuqd|);D7;C$1d<%k+S%8Mr zHaCg0xGEGt^gc&Q<<=`@=m`XmiuJcC(vp3J-P%+<<%0+;9rWjmw*W~b3a-QD@$}rP zgFVyR5T>u0iC{>`J4rUmpMk_nQ>$tn{04^?E7dykf_1Qcd&c0LqQON0qv+Fv&z4gL zoB*ud;21uVs7RGpPnUMg9!eBK;Yu5MB|jJx16kaF;VliD*yAhSO+mG746iq=AmwS~ zTO`?juuaeeB}9k-NvOTv1lfU-Sa^{5CfTzR3?65#jIFyG-FnLjAR7+6#85oWU>U`g zO2`h5Rm&Ai3%^Fd*C*7*@|VS3O;Uq$lXz;*iV#3~u?|*y!mXqMYyyLid&{G&V0O}P z)RWfmXkiknL-)hk|>V9!4w(=`?w3e)ox0aU>|qMmm~h$q|64t*T*s z*}i(fil7REcQ@ice>taYB7x*Z4TTS0vLe<6>*uo-xFc^$2o3_}@=h3uGYJHXaidDNDIMcVw7D;rY#5=LPv@KD$QLuJyoc zPmpD1kabP&wdu3Y8OJIHk!NdkS@)KFL;k9kjc)!micrEdigfmp9&t*n5YPebSASXf zkYeDIL@IC3jDt0-ugEe5S5C4y*Ukd2ZSX3Lh?|aY?;|XNEg((q2Cn7~wvEv7QHO^7b1Kb5 zu+VI}y41wHNfiLns_)jhgPTc65~)}}UUI7eq@iboUHmf~*vo^kggXBK7v5|jBpRdm zKyCKr(=Z2B!e4K;@>yLV(j9330PBJ}3PW0^+1{_5Ip07H&=P)K&R{m<6lEBR&4@WB zL11SC)kA~4dx4_WAn+jYaC1!wr7=pP8q>~6Rl{kw5$yx24o)TSlr0UcHXJ7I6Q~9t z`9%j~>&8DA1`+`cgyZJ;F{^gPXcXum-GF3EcU|Zw5Z4PgF)rV74#jmx1?ukN`Hhjl z^wzEZF0N_b5I1?63S0A=jxkE_o8wU>}DgZk~fK)!S zcU?t08=#%pe)0JZ#SBxyy0_Pi3o9wCe1lHfd*%@HiMt^hw1E6CoMMEN?hK853!7`z za2hapT|F@Y!~qsAxima_#qSwZ{Q7cUNvF-t7P0|e{p2f<4};#cSj|TyM0dQJ_t(lj7i37OtKTiVfoG2GovH%CC7t4fR-DyDZ4!;}5 z0fPXFZBJLX%aOq|fa%;keKZR`12{vWi*@|XdVT>!G+N3-2@%d`6qCOngT>l zkZffAeB~~&wGA2w@5A}ZU62CPW9`K9n!zYazg+N%Y-jD*_bG+ZqShG@K0udn zqsNS-z03lkQM5nSI2uMoRuvBZJzRC9Bnr2BoYC+YBcoyAxD5GM{pQd~NTWf*xO|vp z+6>>(*m?7cdq~x-gCdl7&ETAA1)&Xz?HA`*s!u9a^5|QySr$u+;n4Q|>Fx@ArGxK$ z-ISdT@YGN8T zVwUpbq9sFFG1XIK;QV8a2`+)TcL#Tf+hq?R7PosIM=T;w3)CAlURRib$U-uTka_rY zU#!&$tpGd$MvoyKT;FG9u`Hef7AE#$sG;go&}PkN{$n>;Q&lN)LZ3$5V7^3pbVUuG zVSeyvY12vzPY7S1oNcRNHX7%_x5j)j#gaJ9W~;@>hF;`Q9r?ur*;m$2PDM&{5WuBG zjir*iAB-hH(Z=mW9mKGYd?4Z%m=rbyur^L_CFrEFv{p?ps{*NCKWW+WdcZ~^8a>%f zUVP6O{{STkkd#MUdVEb>0Q>?aFZ8dzZs1A)3D9Ug3)J{7umP2xD)>Ba{opzs1$6GT z3)0^iV0sX5Hn-aAB^AzLPS&HGU2D!Hfqt|bHtrT0;gHsyrqU~|z1G9C1_1&A8X(eX z`IwO@QM(O3%Nss9iF{r8Ue&tWuXr}LK%%ydPhs4mtP&3vdGLK62Rdr z*jm@`*D=7D7!yJQ9B0NXr$2>x*?3jJ5r^tRFxt)YQ^%(~JDV2RU7Wcg@Yi0~Ud_b+9=3W&zqz!X7K+?f^TB zqKO`CHF#GylY-Ea6*=wV;#ag1sh}aLwM+!nRMHX@+S~EZQy9m-$*aC;ePZOcaKM#l zGjRIIM-i%&O$27W`T57BBtSP)$7^@zctVy|=!|BP_&&Yicb?d1RJG$=w+JqXXr2Pq zoB7Mr3I*jh@;)@S;v%?#8%`8?U31nuqi_|dvalhlqlPppkq?DS3ni|5O4{;frh@~R0wANLo#G zv+Xl#rV)o|?h^cJT-(ps3)1F=sjPV|VyB2pt^^xyTvPznqK5;%UD=Bg@Y&qbw0Uv@ z$&CsPn%iBPzBh!1K|Zl1P_1|-^J==&Rg9vV^RstY9h6(_&fM7yXUXj$m z?ye9809(D-S!Obcb}rC=UK2ud30HK+B|~*KB&qM1q-kZKpqOpo>>gpZ=IP)j;Y2+* ztf|J8xkTC|dFuJcV&n+$3dnr@`M^yLp-i$%z8~ip`GGARsQL%&bF@zo?j`ZwzA+*) zdhRVihCdm48*qPF;DRbQpExEf4#&IT&&k}mL=}N3_;qyFQkDf<&=1PS{{R>}m8g>* z_HR>vSiyu=T?jcHKYGtR`!V@Z-yb``HUQ8m!fs#tSb!%w2)>j$>by6AI4X%0@bmuw zG9itZYSi0Be}*B*BJy^Kd3CRNt2x*Jdua3y?;5+R45Eqji>vNqLc#Pq-5xYm+;nAr zPCa#9oxU;B;S3};fd%R0Hc5uUK*K!6Cxt$+hv-76+22F2>muX=>}yWD0=Erz45%=d z=0L~;rQ`|#vXQ**4@pglY2PX0Vh?6ujs=}M+`#~g2eBb^CyUPFFlZ?w@F?Zkg{Z7N z+%>?zEA@>8;j@q1X~(k=8jBc36yL*!9YgHkgTYK78vgPv4S73?ci|`NE)a?%L1;F< z7kl0X8RxBwrk!pO_llE&LX~YQ&leX3M*zU0x*b=_;-Lt%QNg#wm>66$V8YJ>`{9JB zF1YzuR#U+4u>)`r3{4TmmUzGp&yfhFUPzxr#`ADd2LZ|zqc&sE0bud{39l!tDkP~y zvtErXHILOu84Ewsm}y`{2JjD}8taL%AS=B@kWgClABwGVfp%@+s7zAgV^0KlJWnR@ zTAC^gHoqtM@?fd?M_?O9ZYXs!A-)b z3jWO#CMe-c@GTZE*NcdWmQptPOaB1Y^17i~Lu4K73h%wdoD2fJFM_R>RahuH z;dN$Ffq{}cY&J%r@rpm-JpqtGTStDom9GqqOIAbFLt>uQ3@x&NcCAnIi+LT^zS77X z8hXLCr?G+sP{ygOVDXC(Xr#7Qg__mG<3^yS^iWG*8LVr{yeXoIBf0~c2r8}R)xu7j zy7FR_aK;n`L~WmumADI8P|nny-a6F=XtvaCc6@whfPgi^d^#Qboy{9FJWUwvi(K8o zu@NG9JUGffpE#7$;N~Kob*}y6tkM&uKJws!7f5^Dl1P$CY;m_`??YLoy|x@}AB zjo$aa7}7!!l6Gn3<&xr{V?R3|fZ-eb;=c~K8V?U9&+7`gByDU$M|-E9V-JmJ2qKhq z>iFHm0-%%>G}7pRx|c(DR??7>l1J+luUe~>y^V+j3xtjNelphBWaP1 zt?Te&B?B^uR0o~UMgXAIbxwojc=FEV0IVV)1WNgKc*{vB{Ad6Xh0*5g5Rvn* z>{2@L(kQ8-PJiY=g9a4qUPsdF6e0kk-r3OCA9E$5jrpgh^!HD28-B6@NQ-|by=0|X z1Z%TF;`8x?U~9UWp|u71z44C-HuGRDTQKNTWufv-62uB+9%7 zD^DJ751&cw{N9<(<0zq6MYPkemoL;j;NH?gK9FJ`E1FV44$4@2zx;z}?w2`n1 zhULaVF9|06ZEy9F-hd1cR)H@5i-$zh6A%vbUPWpnt}1veJ0ZcqV59xy80-lG00Ob|qH5eCcgkew*|j)% zhAs(oAl0CNGMua21V*E@M@3{uyvK;WdNim>1FZn~#;T`g!JvJ-hNHe@Ns82&K?a49 z?(j3!nBF%=le5ltBb9KyFMiL~5#*l0ZiVGv!ErIJMZvs^HMS!uOk)fuDKDWVs<50d#iyf>07BnH*D$DVk_ zRV7L-7Uf@-J^Q~b<0(+t#52jkg>&%i(^R7T|T$4){}<>wJr z>V8ohhA%$I`D6PflM2Yu6`o#MPw|2Y!LBv2NXxUq z?qaaVs8#Qy-zWwlV<8$QMt4yhSYr*$OewQ#e^s$N~B6V=|eyeQ<*$snYS zbK*=?0XTq)!qEN_?<&Jl_`t{1@jQkaEevZQf^~CxedE~gGazog4aSw^%T^_j5MW3t zcNJ$bV^ES%sS|DXS>VNMWa>iHZ0%6%&Ie(M_yT6cSXa^9#c3k8G1!hzn(d zQBCb73-5C!2|-Y{2n7_0N*ygk&bq*uRMByoDaC$chgG;}+FP zBWbYcORujuh6EBHFLR(DI6d`F9s-<<_1BXGlCYJlMm{d}`NR?h2qoB_kof*_ArcoF zb7BXaUMBHgt!XO{u43eSqJUaG1}w}VfwvC@vGkaz>!qLV6=#zv$4;`>zKuJMPQ-Op z8ma~FHB;{|R9Fiy+}~Z}3N}U823pDb!XTK%*!3i5XT~PYX@>xMQ1yaD9gdFcrQjP` zjS>+k(C?$`GM?jQ%3+$)h#?>Z0cIevve7Hn_ATDa?plRE@@mqEP*ht=|ya_0$ zN6K%hqrNd7+Po0a7kk|K%_>CMXnAO+{{S5GYkCQTvL=?N&2n}T7r=ObJL7~Hw2XMx z&Jj@F%ZR}#+f-ZGBoBOWSd=cI=Gwj&B2?MPW$dW;HZ2eY(Gh^YCj8~JFqVXm#1ma` zMPLWwBjM*FHC?DmM}H>1@R;5`AY^=vmDcr|!e7v2fFvZoymd0Imv!59cbP9wB z@442v9w0?HD)uR@Gx3Rp@J%Ki*9YPHz*IL=r4${7_wP3{5dgm^-xd#v^My;qgAy@y z;HR$Uj6|L#@2~-}GCY6NC=|khgQ6Y_(G=Jsdfq39R)t253_&z|;{mu9f|m(MG+tD} z@3taRcwMJL8c&=Y9^V_M3Q<%AU75gjIkmI90tlPdKbf>mvKdf3sULU}#%vf+nwv+E zm=Kf+PLx83)Z^KJ>~a(XK~T`vmi*#)35w|8v(+MAIb8xDkUoH%PfirCY!145p$z7+ z2SRkJ73;;}t=BA|Mn{h+Vdb+1C`grSr8P#5JqtY#FtDY5P2evuY40KgPK$6Gr(-@s zB)Yl|WwUlmVYTV&PrOKAg;3t1k?VZ@WEzI}f#l^k_kb?6QcG+|>n~uAcs-D1n z5STF?LAbn!QTAi&W{^|uw#Z=>Hhuswdo-NSM3O2YG#hF8%6OVZJe2^xTihB1ku0~Q zd~a7)Oh~9a$^zMAubt$(f(pc=m`qFXlx;-?~8% zunj@*S5=-dz{1<-k+2c2x2z?1hEYhG-TMCV)G5j(^4aAV&vHto6@*B6Z{Oo5W->|& zL!fK@TxM-rC1nTC*MrUsfPk7FfUDQ_jv;9a6F_<+v(EAp8h5G^jjgNMf&?`oHUl(| z@ZT8TOD5Ht4-|Pz%+M)s_uHe{=M9mQ@oP!{J5M!E{JfbA?3>NqL1Kufwd@3vE}G%d`i6UgjnyRF=V z41%<~iLl1`!*Z)&yZ->piVxd@l(8euZyXp#M9>Owoj0lVlz_st6G8$fcjpS~f@o-| zX5aMUzStHB@ZD^<83WZxO|S%)&BTxk9i0L->iM|$v?Z_@xPjv~Bo*+0Eg!F6c{{e| zx+0fn8s;@Q!08hB4>iJO;^DWIs$|!UgEZ-6ASZYg%8-QE6rp(4`tgM-CRrO%3;YMh zI;@nk3TXsgi@EWX)di<&qxAmg|=vK;_^Yf5`+62%mL>__|aI11FM$zGgx9==8%kmUmk+R+x6-y_> z+01{RT+Lc+)9b5sH#y@0ERvdwX}^X3v5j^_rV(Xzzs75`=tGq-s3sYW)DRCM@Us4} zRKulog;n?(aDn#d)4L)EpE+bJERZZ)6diYlEOi1eP<{gM@s8^X7Ea(S^6;`^4^V-_iF+Gv{Jd6dc`sYb4H z2Xwa;L{T!ymeMBu zd|{w2xRMm#4L*ePb4J1}>#1Q8sY^^}mM9;H_!Z<+Cu1uJg^0Kt)|J>}vib_{6$;*FMvMtexnK+O-I@8Z5 zLi;SiVC)ZVJYm^U0I9GLLA&S7#;y@VB#IV1I`M(>;57R;$e1D{GJsHQ_|B{xm3Bsz zv9}%`u;|&E7fDi@+qO>PWExQ25ROaZ;|H5Kr$C6RN3P^kKx)UPRDtQy`pCm68K+Olb+(H zji*qma`z@J;?vqa(CYH@1Ud!MhsnQ#jquSlk3_YfiHvz1B^^8Ze3+9i6$u!=4^NN0 zlRCaffTGuZjx4D_)Y|*=ybO?xWSa;ontLxbTw5{LHcipcs;&6$0hH#kew~7V36m@vH_tk{v^1-t@o0hk-h1)~4(y@qyb@5}mN~cQHF#HwSM>e6q|$ zEIRkabg!(2h)IbQ{jGWK0M+@#SSM8Sd%3Y(AjDlL%}pPFjBPMp*xjOz_rm~}ymZ+; zX}HKfkr%c-S8QZMHp7-Z}W)m*$;n2I+06IlXSH(3TlZ)AoTkX2O?Y=c+6 z*@Bwc!axCvg`(F_IbYQ7&CO0UsFlZ0u`A7FjYoUya0M%3F+&Jc>LTO(8X!U_Ny4;E z7}9Y;6$vhZ1b)GoZX-noqPxJgB-+9Q$`-qgoy3IR ztW+UEHeSq3ctuFE`a?+fB+MGKY3?ImMvP~`0E*|pob%3Rzon>VkXW64tM!DSUZCj@ z59_!uAPWgj#9=>pX{us+QX58>RyP)-Hkv$OvsU@TA?~~~(`h@uotRdF*gJabz!S3> zh;;X`cpd&`6g%1hR71=w~jVCx{$sX-)aW(0dwDpkhvQ2Bs>JRjq{gex^a}K|-eP)blj6 z-bDr_E2?-BFMo{fa1^P@P6{8k4loS3cSsMaUpnqBhy{oc4xv=+mmNKzFG62J>dzS~ zMv}Ek=qf{A?jXVC?eI-H`fDRT%u?At={NU)w&H3SQ;{F0J;4U0Z-q7?ePy96{iKg0 zehG^X8AO)A`uUIRE22~wuSQogGME?MB z;qpITvC$-5r7G)2^?Qm^JYG6>`K;rcdcjgnoMhTN474vBENBbAX3Ksu7;w}+AoKnhFgg%4=qE&7zNT;xD5KYf z)A;v~iQ88O7gi5axVm$qmWrNA}oAInlwpCIrVn6{44;Yp?y@H^p7NN*%#wt%L7y%tYmG;BU_-~f=%Wr1o=YtC|J=`yQ&bcyT60vC)hle0nwj5_9A z@hb>ZA_PnFV)#Ho?SdsB>*1bcCE1{g)4-L`=TA~m0y7?g)PV8D*s68ZmT5>n195OS zK=NAP2b4$W5?aw#fP(?y5z|aLZ7b6DXrxV1F{h)gD0AqD{%}(Tc)`$_J4uL4K2x4H z`@y-Le2H zyte#r8(@A#_z3Ey!-B;&~*9G zYZDzST_~qrE3J8%0QiW2n~)HzF;iP~s|j`q^Nn}0H`t=r%B|mn9Ow@tcy77n?|oAU z005rXk30Fsz_5gDbIEVk+!U}97Q<1~WoELc8p;tAcapb3tl6pN0J@Ft^tRxfJ8B_c zD($fIjHgBhs<3z$s&CdmZ=*q4c~jA#+uR6f0nO2rs@;+r^N1BfERCN|c=bE1Ls`); zqP@}lelfw*g+wfLEB)oH6n6-Vn<)ls=NS(cP)ba`-g)i?C?Qc(YEzybU|+CDLA5V| zH(oGewNgyUo{QTp@9X zNo~>_d?g9vUl;`F2B0PDrHa?W=BK_MfY;|^>nj{J(@EIxMmSZH4MGa*NoOC%Pe2xK zo!@{a`lck3Hi{1Yz|xqRc^=M)&Ff5?)*&N=Q_*?&=l28%N!hClXigo+`wXIlB>I=Q zj0QG@L_KLgIR)U|*hH_G?+D_cgKPjb4@Vwv0Wq(9CXY>Dyh>b1k)k+VM_a=-SXoIt zwesK3gEpxagaSHH!0JQO)o93>q%7>EgYbH}GrI?5NwH{F>nm$7*{`mo4vBuSr0!Df zC{V0AK7#=TL&*u3$Km<73E3IP!;_%XYs?xH8LVN}~REHsx0 zE(U_v>s`@lxYa8g4+6d6+OOns4Uhs0K5-ozGQfO&mo9ga*fBd z6^VQp!Mc_qu!F~4{Njy5BUok@1B-x>v=F+tx~spzb^0- zLV=-|s;7MpG_WVZrqgJO5(SA!%3*zp0<v{ur&2%*L?gIWtH~B0HW!+O}Gk< z#ROV{O&@Zv)+gmrTMRUyf#6?_go$i`#rf=BW`VRoql$DDo|D!E^;6xVbPHe36u}}2 zD?B9MBFq66k)o9tfC@9Sctc^f&@RIIy6}3)un{$rNqi_z9Kqf~9wTrFs*1l@52N~m zARST=JGqw9O}u&yAaiG)<4Z-RMw6gO0q*+1Qn(EGwmNuLo_mp5Nl7H5`MSZH{z=&y z8X#|3G-{;7Y_xh0F7U%<7~!Ww--5pw!$;K>1tGgn7gHKGJWvThJE^_+J}~VG&YOYq zz+gtap7*5RKh7Z)NUJoeBUC=H0AY4WlN;RXKNti=2|$xX0i@l;_7C<@<0(3Kt|pXq z!amsWXYUHebr9E3w?+j20Js{8o-Z8MoM0dsQn~|4#LBkMF$7Y+kMo<=;Y~SukZfOW z05K?>$H`FvyNcj{BS!#4pMX8{9HbTzRvc~XDK{|9KuG7&%q?^&$T|a?eEB|dvAAM| zzhlgw<0>4yLEB5c>mITSu7V|F<#ntmm~7(G1JVBgZwb%5u%UiLgX#5xtpNgPT@ZQe z0mgZIIuEXo&QT@_R;YmJ@hqOuH(U)Qco-TS?$z~%Jr@Ea0Q+9mT)r}(LscD+ zA@zWK6vYKs=4-Ey#!fg%OF=cW&hir`vu_u|OTBo8M4>8z1vDF1AieH5FQfvXN!@Hv z{;`wbVz&de-(KG1Axw|~u<@1~LvLmvZJOaV8?CE@>_R1YzQ^`+Hw7TIDGF6v@opdJd-5>XHn@5||j3y$Wz&GyS823U=lDQA_;}g+{3ri0Khrxw)#^Rayr?P*% zlt&q%7?;a@d6-V<#;B!pN@wHFAmC`)jw^i{JsA=gex8pu>E(Yp1cLmFP^NGR~Cp7OEy$p{to3C8$-ux(8rfd${($QCWY*N9Kdb&60I z9iy`V`TqcU01zpLpr^7Q`G98Dr8dh-!-uTnyx1@irE5uEm<5u-0=7}Kl8_j zn^`8~rzpRBijzRnu9fE5(R@EzZYfYk{qQ3xdzspau8PGm}? z1LV+s!x^}{Qzi=VH736}+0$f?fi%RDdFPy=nU)`AjZk+3UH6EYjSfvB9c+aw-eB3q z0|q-%3rpVTwF41&uB6}3tdy#&My2GzO9NjREg2lCTA{Ov!7gZ1$8+E&(6#s5mD4N) zxb_;~w^)z6!~#_E5Y+PHrl?^6Z+mN3%6P-CU_AVqUkc#^5xNbw;&I1gm3j-o5LK^` zv6_A{WS~4QqJ-0~GD@KI&Rf~<-_|}QLm*vv6Gt$Hz(fIf&D5u?FBlC)7Gi5{29LbZ zzagY5+|jQ8061hvtrO?~SJCiu4e)HnLZ(jWpgsN+*({&HN9QY8)F zhg$IBmxV5>Q#DBCY#&G@CmbF9+u^_pPJuWw^+rBiCQ|JYHNHl)@n-TmAyLUEnj3^a zjB9w9q7P0aH_uoYEo7u9o(t5tW8;H}H#_RSa9)TCHE*i;@9#G)=RkMrE|Plnj)g0p z#jl{=zj>&n2Idkqx<5HQBRPWFei8g+5*OW0==k%J=o(6h52bV%74PD7o?9o=i_!y7 zO`=~BG#)Mh?O>;>fqjvk$7m&e4FN}@vEEKBrZf(Lc?-vqVo1bJ)JM12<7ATphq_P- zhUfyRi>TZ*Rx|*qs99D>ARf66p{%L+(hXC=hUAB>`WJ?e!Mzwa%Cp*{iY+NT8^x-K zYO1XwDj+9r5AX=_a1@KR3OjH%w+!qzXED@kEUio0)|tM6+tV9-4`4h>RiP=e+-p$D zlC*4sN4@yo9%Qk5!@yCwb9sdjt7b|al^gMf{{ZXZ(DP?aq$=l_@5IFmBvU|n+jl49 z0kV#DsU)c>G)z9Y3jp%)SGg6sJ87RJo?f_-!7pE7@%N1G!Y#(V-&OWtL_Bu7Z^5lQ5d{oqj3{Y0gA!k(j$Qp82wp@(RA-<)Gv1qZ+ulzD#{*$qk-#%$ba;&&Wa+@;(QEs-PM z;D?d40X6N`^~Vx4z#)VO#+3QRi7sxG&^}YKzD!E55yBJ1M^^|mPC)ZF)5v>qvIMJJ zZB?y)M8vMT$yy9Jn|~J|;Yv=2PdnFwpIoj&Cbl$v}GBuy91en6`^kVL&Nac#iOPd@&*j7s17rfbK2-a@u;gU+6txF_8^L-ehLh9~?$da+X!qHC z9uL2V6uJhBf#13F=Pxu7v_6EJzFb5o-OlyfQ_F^A01*e1!=PT`Ae?iA1f^5YJme}a z8Vx6c0r>plf~+Dp02;5JU}jnX(gu^8-SZwp2zfFniM#FLyrvtT4y2z$;aFl7auZ1v zXNIQ1npiQ4ZFXh&jQPqgM*w)jq5K>3js(L~f3W*~a|JwCJyinK5BR{R2x22wQ%85X z1kp`p?OLjNN87w&H#!B@hWG$4zT%06X8=L++o$hX!m4~_Cy0)`oWX1YjdY+qE92xD ziTbF=TSMcI=NPMORpue%W;(O)B;*IsHtS?JmMEmVg}kNYY@NmnZ7{U2i0St05SKy~ z4G8LbaY;ox@YpBfZ^iUr#%>5!A&`UjKJX3@txZA>Q?v{uf3k-5I_rz6jN)`cu^<{H zrV2i;bDjrBe_nA6IfUGIo2m2f6^a4je8Jy$$=qSqqA1sp*9Uk)D+(e3V53?;c`1b& zSu{6I@Umr*n0L|u`@cDj`(Za0LCgchn6(quq}=)DPCVbw=>KG+0j!_ZQrYf6=$1)JcVo^>&6ejBhrn7 zX8e-*aAJZR5Tc)7Ox`JX+2GYu=?`x>h*=WfFH1TS_NyLPea9xgI)To_gDK73qSlMw=R zr*)_2cmYv55P1P$e7_hqqPEep<@5M{TryKLu|-Dpfi;3-kpO0g zq~D)^89UgXr&TwpXVK>sLl(>Z6RP&;$7(snk|bc0HQgW03SH;jP&4%08S zeqR$bdG|2wyiR`0k{MA>A9-P};?21OxGtx|&-IEpQA#e2N4CK}b3t^=Q67PKa$gu& zL8T4G+D=$Hr;LbN5#EIWN@+^XVMWI6CcMZ}RaDlGXpoGimH7mzwR5v1E0erU)KF(# zOIt(t5_2MwhcUpnz|S;~4dVECn*cs-FyxLriZGAdZCgn+qpHOg%8lb-N&8 zu0l~k8`|lUoWdN;r9)npJ^R8{M#Nr@5&Pz_0Eb6vj>`Hjj=5t}rwVOJ)H$qJIo$ad zdv)LSi%ij_i@kW`hKp59Z++R<1`-9~q%^eK^2dorKl~ zqQXBJU1=2SaYB?xUAnr`tDl@xjA5c6j&}U>xIz@};`KI@*SulS5NK#?wFk90W95S~ zy8_#%4<0b9keTp|0HBYnftIxhMG}i9x8vsyC8tIeVA?;XFxIdzfvLciYi2Qt#;7_% z!d5>eF}IQ{0BNFNZnnGTaJm2khkylNv&L^Ckbo|ZZ&n%@j0D*$rsWB(9z5U@Qh*1e zeG^;N!qI2~0MM&5=B85A&RSI`Oxwfo;|-ZQ9miK-Ph0biFD9c5BZrgTNvIWcg${x% z^W9|U90J)+Y4gh-;m@G-KB3i~emzX5VZ&0T)HTCfJ~M(Y_B@3>S+9QZcWrHhg0;eS z>fzk<48>U*m7;y(32l8*OEkvqm+KXBm<1RmYg=DmjEo`#kqckF9>(Y6y4Sy12taxu z=$mG~mjMa_%U7qLCtnv59+*H#E2e|wE+-ANTS%wCt@H5XK$Bxjb~PvL<`q^D{pNxx z(!Pwa4^Rmh0!nZ1*^$s73OFdRefz^4RTzMpNEN?$WCA-;PbUxP$5FKa$9mh(9&*|f zqJGeTX{Wth62u`10uh89hF4_;;FIE};l`T;y7$kJ)3j&J#UP;6OSCrB<0o*y4&ZjE z*xzw|whJaD71)CYn#44L5(zZKcBzuOcHz9HjR@pJmTwBEMa%)EP-<1%#wm}3cZorQ_qI$mLd9ur`w5u_AH0Y=a}myiG^=_{z1Q%kYPN;cOFr!+wHaNdp6ST3f94-wn{08Erc zBL(@VgdO2c)zKj;^fcbFUqmAk3mlaAz>HiB>v!m@UpXg{(IE=(6x)HK7%qoV^*s0Y zjDch%K|^W*3d~TzbP1whq2>3M&5~0IL#KN_aO-eZs@{BoR1M=B9!eBqB1d#{SchLu z?gxQ`{N7^Gso)wB&@Q*<9JXFx3L6KHoLUfS>=MVJxcS03#JT!EGpAYO0l6yLYFi^s zmj3`)H$>?Wg3AwE-9H(sSLvW9&{}4==<^3hd=Fe70jRJWE3@TKc<3M7B;5@Mr*z_M zB_jD4uDxu(IjbKUtlPwjCb}EIYiVYH4#xb|^@SQhBNPWpBs^l5Q|rki+o?m#g9`RY z3#w^4ICRBrAlNwg@8!kt(vDzW0Sf!vGC)g$v;l!O>#uo(pgP#7hH0BA35L}Bw!p53 z>2Ko9WH1>)ik=Z90|($V3N^PBeD^%@0(8`c@*#)X!2SfSic1am&L%WAvPQyq{Tz@6 z)GdaLKYHGCO+W!)seGnfUX)Be2#@~&CR_~%e`ybA<>omknD{@&ehhVIC!9|b_DrX% zcMH{!A3r#a2wLDhuHH6(Ikx_g61sp{&EcnIYzmN`{{VkjWH1fj`5JS1AlkJAC9c08 z=REkwLuGE+z5QfZuq}L^8i@US#$tBG3G`{FF{qNYDFzr3$RYD*gK2O zyB1p!p!hy63Zvo-MYxCHeDYQ}q(O?W0RX9_2YIcVU;>V!7y-$(Vh|KUo^gk@gftXY1F8wt zb3i>RHiQ+crszS|ReOg8Zh>o0X|3UDp|~dyf@?vmE{rB26$^@q5g>z0ykSs; zFfh;0hScVJzwO_^u{5?%-fB2xP|hyu`EWECkFZT9kqf7~ecXy@uVZf|^Xv1D4xYjV zPb8%NabS$rLpLI=D>;a1wPAn{vs1glQyYwFbZ`_t@U66&B%T(^@LYCSfGsG}G_YM? z9LAJ{fXh0y2UYQu*c+DWZz_Q57^A^ZZ2Cb1-uz4lbf&s&2r1=}n5GM=s*z=luOu*5 zC@E|#?w4=BoCP040_{g&4JPT_cKIztgk4Q`b(+O9T0k8h7hSq;4a62<(a^8vRm8iM zw(%zdchEb+yrBbH8hisjH|HE8eMt*Nr@=KmZNpd$Vj4=|EQj-zM67BZQ+q`32@F7x zpJ}%U0sP{dgepr9rCPpbBgqShodxSo`jZRUNYDY-VXAy&=rAe`r5KlAPF+Pb396=f zKuZz%$~VZz=E}MolsP366M;mmK4-j!oSIu0XufyrSl5srAc0>R-adr6YozEW7tRbw zq-k!zN4{VtaR?#N1rSyEz~Lm{ws03kxc2HeSHQ2qF_}Yv0l0mm^?q`;qThoT3#5K=vz0<3P%J4|PCnjj zHj-5-0z&r@x-K52>`HNV*x)XaAu9GOq#UgF#}VpAtWF4mxVpnm#kJU4#ia|TgETNP zDO%z|v~+vMiiPfNwgp-PX1L4*qlyBj1$=|YA!!0YxKIr=0Zan5b}6XngYKHvQccZe zyP!$ml3Xg^41x z51sD@(Zs=Z7<-N%oZ)~q2o&da{{YOlGSUfRV!45QeIdI>B%@ZJj`p#{|N3emGn zqNbkV6}N|hwoK72rvQcUYs7nr0iq2}!fZNS591!l&L{{8+JNaJku4~IJ6ov5+xx(a za`Pq=e6EveaEE~)3Ng-(^mlsmfi){_S`Up&BfjCr0V$z23$^@eX7?0ir~>Rd{tR~l z0hSe)R=ys2)-n`UrV3q)zdF`I5d(ryP%lynakj5DWvb zv=aE433Jd$((07BRo8K2-(?Tb;4a#61DP@}F)ln&jKa6x`S9cPMN`G{M)6Y~Ijwv=2H(0`a5uqc1(W zsvj>Tep)_oIl%_i0@z1TF0oy_lT`rG4R7NF0EkuDr-mdyc#?q@f~n$n!?P_W-@FmL#Z6PtRNh)f%D{f}f_uu0BnIzICj2fhb{^4Sx?Q&OtAPr6 z0GeA08F8J6|5*c@VPSQfLc1GE96M?PA<`I?ARq9d{;F?{SZN#L+;e>0TWB% zQo0_Ce_3pK4HmBvdqr(IlKvq91eHRnn(GD#q+um@eob9ZSj8rlRMdgec*hzLXC7Zk z1}688pbbwYE*?|gNaKzQH*~m~v2g{n0O((4q6=YGLw9mg{4FvnMhT=%_kgv)$7FsW z6iO!fmN3)+Ef!R}1MeT)NsmCHQqdTljRmZ%lymU)D>21ZtKaAMWAxCV6RHp4*fR*;ivwdk*(Tu_7LAMJj8)z2|!oc8Zzl zcJ2LVVrUmeYxex)6<*>6dMSLlwW``%p>?zAHSZ0x5p2ZU!ZSyVBC&?iDMDRl=mR)H zrkVh@Tt4+;sD#L^vF3)26_To>%K~BXT4fhg+3^_|R2KIE}^MDgn z8=ExwUmhIR7%5VbL7JTIi~%>Y)~$pt;|ol7118Ea?~Ytyam3VXd^~U7u;!@P06aH- z3Oqvqm0F2HT2z1o+lr0qeFQ$9jB|rc)C5SEX{TMmUZYP*b`x5oH;#BDCo|{*C!L+g zK9GX-?&NOJzkX|Yd^UYz*||Ja_B?|L=MCbP zSdqIzbI$R_1T^4WF!b{LV|I>}gWDS`{T?!fR3@xc4Bs}C+IZ}<4aPBfp$I~6TYye+IH%ZJFR`pD5D7IS|sdOQ~1q=HrXjwX^-*D2JJlB zrHxLA`@vSqq3>jDfE&=M^*|s;oWS9Sy5FrKuM%|WY&NYG+rOsqcwuc%ia_n_vm zP#b(zZ<>3?7IFR6*NYa(d1fC37@OcuIz!Q|xhYcy&qY=2Ltmf(uW;-b$H}}*UJxt< zB~e2V5s7h^UZ%t;?t`%J3{8~|;baX{*TIPi(JMyp#3m~>P&R|bd_4M??FIKqc$;0s z{{VQVX(Uwm1F+HDB29r6wW?khI@5auoS}4i_m(M*su5@IE;&8cmeisAIq&ZfU{v7t zgstGc%Ne2FCb{v26YKy0(^rW~=dKV`bXrjOmB5|g6A4K-b>A3CVe8_K+h(VSxH2U} zED(Zi;=W&l2-97~Wq=)o_`s&190CBmZG1I>1%@ml?&_M>_nX9+<`p!ecgHb`DM148 zgseZ_7Fvm0L{8Mdyf2_IMc6GOZoJ`>5}+6nD0WV%s^y2}WKQ?WADpicZ#6I`Qbd4e__FIX#FU}3UaRj}%rUQGh72p)F+&*y- zP${F13AHY~CN+di85(*iS)qr#F69Q0lAm+K=i!Fi=ppuif*|=($$%QQ**EVg-}T-NA-*P)LPzLsaB^;^~|QMuFt*kBRFHcC=xEUt?PRWsF#e2ygZNJ~G?G zs2NhS@5|N^0VR)r#H#4Zgjz7 zd6`qB1%O;`rGXNfudy$I`N2oHnE(}46hw#vJnZ`LeAl!!O#tLz+^qyWJmBq~3N zkhxRS0q9U>=2E06E`=1EPrR-|heVfvUtf$I!0E*eo_el{b%LT*wZK$-gJ&;tj2`T} z6K*E8@7`SkR9S!;qy2qjcR*A%Qnan!-I+>u`U^m-s#;&v$gq3)XfF1#^nKu+SoYTl zcS0wG{NS%BnhcADhwkF4V9yrurBQ%AYmbwvRKy@iZ?ArCAR_=v?Blz=)+mAw=^rEE zl!Sy;=&zYy8_CScF1Bpw8x8&BWtGS{2bUMWi;$w(A`zwHke=4!$k9{aq2`;1&P2;a zG9sc7F6-|u*)q{Z(Hiq}bH+GtT@afCNIL_=vkgJ^hLk5*bHKQ0Q7Hrjf}1z)eB!BD ziGa`^3*+I}9GnFX!SXM4KIe>iFw%gkrtOEHE*7YOPR~t8TGmGytEqHXZQrkqSfoXz zg*3NPW!QCUi?VbeZqdc2Dzo%yMHRmuHGqbKfC|+CHm<)oP|;z!;j}@~bdyGD4?_fa zd^BIlh76Bg1RcJ8NA@I=MFmA#9$waW9swMv70@&R#NH@lz>N|tqocxKIV`D#RtZ{y zt%7SKoxudHL^Kn8bE*i;C5T$3+bWX}O0%KBr#m1!j%)G-;7SPxWC$x0SyMSBAf2CK zHPF^B5YqrnQC6V>{xQzw9UW4!P=i?}D%h4e5<69}3wp}Hb!ZPZ4-iN)+!UWls|>vp zf{8q4rti>V*pcitAFL5(n0@0LI~&$>4t)H21K$*B7p@%1LMvXl0xD}YOhT#y09Y)1 zEQIHrQb2_zJ9$JvFW|sBcMAI{;?EjpM!^gg?u|;n8o|mAsZ~SJa$h^iCk|AWhl}mQ zA4o)TkP!Tdqoy6ps4`tHl4xIS!_=WN0xy;HfPpuRr&8}FBk{w;ec?)I$UzWgqUS5bc?f%?#<|lZAeYAO-|Hj3B}Zdaix>I89V%<*Cim`5 z+y<|3H#V!WY~68ECIFcPIH32&Iz$7}AnNqqrEhLDfNXV=?~T4bK5}fdH$}gj4ql^! zL6?(;pJJ!e@M0102sEd!`9nO-A`GGi_U$#j;xr{1-Oc3iYj{O~PK_aV5|+Lnf$_U{xgHfLfZfp+|7TnXzo!LvcP=UIMH<~t{%r_p^wMd{%Bw(! zF&lYDUHpqe?u1NY;#;)XEG;JqF$JrMXlNcyJzco;4j_^2bejq*Hv`Pc4$H)PhkqJZzcv3s6Z6DH)F;gc28cuz$giBF_X*(cqX6?uDxNC%8bAT zf)E|otkJFnp#=aofqgC})b1H6wn36~$8|vP$F?@F^1%T`mug9!Z(}}T^ z?lgbHE-`NLN$a5V92K~(X2tJSRcMA}rY zCsKxj#id3M4elG^h=ZoOL`q&v-OG!1g4<5Vy7!DRtGo#AB!pgHcsI?1-qjHW5$w$@ z7XdAmNG6`=4`B)b3+Z4oy~9<}s0v9Cl=;zz`=zV}TdthVWJTKrK70!5gw5F^C8)4) zMPD4rCcuQO*a~d!@an`w5K&{T&IRAR=Jea3ZArIu+FU)DAQc+$hTk}D29=3BK01{1 zn~;gAR1(DvKD}nCaXlEUBd1?@F~XHo3tmP;{{Y-fu_{B0*4E8@++|6i3$kpou)!z9 zn0%(tKE2>MqfKPFo0U9$n9@Ap0x~JRpNnE{e)= zQ&7aGkkqpQ1mN&6Hz9iKz?eps)&nXbr08O!zxpJbgKo2!txKCsNEp#?r#?uQ- zAVr-O)16n&c^vEm&$W1b;Fwr45ZJwk%R=DM{6^^t__2NB@c=L_kI27zxMJ}0V1#&= zUnkx?K!~v@E5st+S(JkUA#RB0LLGIDzME>FVxBxEXwpnsZA;a5Z@94{nva$Agt(ak zUC~9m;FkwD7$pR-{Ob7wZVKr!7Vpzd(Ea0eJwW!W`88jxQYB6x71(Ye?Qyao$YHb{ zB~VX{MXCt_x*edw_ll1Un4YTqkj>u!sM4Js$Vp(n@a9lq;;i>)#lTq&O6bc;EDdeQ z%0xtT+c)V0#;|~?Ey@CWgkQ!*t3gJow%Tnx6AjQ)Y6>0^_%-h#kB)$iEx?~N^_s+p zkVemudwFsLLK93_^;w+oKKew)uEwu%cwpQR!PyfPCQ`0HAs+ zyIvmq?os#(=TgN+mzmWj0E$I-=Af?qWye5;ApE0K;{$+L2uo0GQODLi9hF(wjeQ$U zT&m!>f!Hc>Jv!luVO?6tQ6*`4GIKPv0V13B-7?0K?Oin;4~;z5J{!fQ-J(c8tly9X z5FWY)B=66vhK8)6DQH!*dk-03p%nP7;wF!uGZ_}x>lIn0@?JQ7+HC8nPCkEn#vxrk z5%_kGw<9_#K>!p&dQ?%@GO@ky90N+cpB}TEhe7NvhR-{|CAyOO*e?QlUyK7zm_<&dF5qY2@B)3g5=j_X7oZjam@$xf8Ly7>c^Z`dZl5%7lou7QM;BNqk-K$0Oxc4; zlWkf>P-|#7nzI#F%tJR~Z+b|v5#GJl!kS3f!s3hXzz~3lA%cKC;Jig*!UItRc(t<_ z(4M11xw}-Vw2yKx7(-?T;P2=!jG`Ej?ga`?wo-bn3F%=af(R-T>sfepO$eHT_e9bs z#te$kck~eqLab<>VwGW}OQ_V-kYVWvLsY3=WctqH2_T*jw@}q)HEIItS`e}YL^pUQ zyA!$6Oh{u}YUFFw$u&n#tn)(zFrMzA+5l_~>CFV`!^90|2SX?Qa5hftc=n~?r005sT7Q|@x%hSh1C1dvNqx|qt+2_4ui%}c`vNO8I1S64QB z$i9G@G7IRF;}xK)8XhQ_*o67VAuUD6q9RU>R!wGrSRDWr;z;qjgwz=Dp&=X$>S{Rxz1U?@T)A5TU zb@uHwG@m!lP%$F#if(c&KRF|pC>TOK9gFTb$RL6@O{^b}20<{jxkJGO-nlS7apcya zS&Mt;4?{#CiWBA5_m|03YlQh|^SpX75kTgiC;jUXE|rK705Up0Fah9PutfWGF?lk} zgaX1KqqAhinq}`O^fbp+A2`ecqD2=Vi(4?t#Q|Q0RoOPDS-Mp`ndOKE-4YVz+!|Iw zZGcD=kCr=j{Q)TxX(7KDo_M{e(nv&>x?nkBPIdr9>Ge&K-i%BOh7@Z-5EDS-OR9?ppo(o$;1?p0nZdCozzh(PqwmtBiGAU2X<@ANp`j@CkGXdmDvrT; zHhN(%>Q(~LH!$J^+xHDLbd6k=Q)$kOMGX_qLPglLM-486%v>K}{HxG_uDAB&;xl;` zkmAO#%i|YoLplPOgbtqX^xbSCtwOY_EH*&TnOIt?a1Fl}Vme5{6i*B7f0ixNMolZH zB}>Nnz;kS{Hw4kJQ{cd56_HF}P}vvnt^^WVpv%$JW|=Iv zSPk8B>@t*~3LgR*yTTOLiZocuHGc9?P$y(S>aQV`f{Zm+EvVdOy^L)T!zAJf#No$c)nap_qjndCy^cOo-pFp0nz|! z3i~*_#?Df3%~4@ro91f)el2JK4u=)qBG4!(z7g9^n`7~mOh{O~9oKuDz(BG34Hdw) zKRUoIHH{Gx)s0l;GSHh@M-PFjQ+@8!gbEx_HA-pD}Kp++!LA%Sm znP8zXk$9%TuTu%&jG%~??4)n4Vu4ja%XOEXZm2jkf~e>Ufv5niO28@zuE)>8i6jU#f+!cz6V3<+soJ*bwB304%c&LG zcC)Ah2ltX!W~GfDl5%q{Qjpq62Ue=q-d!f3vUX;{pq^9*9X|}T$4CdWUd4VH zBg!b)3-FIegE?~LvB5N(N$DJFFcFnxPfd^G5D!%mKs}WC`opG-4^n9atspSu{)R{FP+U{~lbfenr!r69~s)3!SlLa{jzH-p!9R1zvpI75Vz%CIml zHOHvalUHaCkQ`0X;d|gIcR|ZW0=|EG z$0MqV2A$s`ZSvp>#iV|o5CwdXaE+zJzI$zt+1{~gg3V;1b`LJ@LdqI8Hm(#?Z;S)U zS^_5LP1tJ-P8;q*rnbua`C!=Y2+>pIC%|572`o;CAeIf^jH~x?Y|v;cb@PmLG4&&* zpbd5Nf`}v#L~FQhzHS2+fZ0By^__7{$Z&saChD^iwERaeZ`N}`6z>!ggY zQcYpr<=^I7v0wbfF%2(Wnlyqs;eyoBuyhA?7Q6GzJdTb}oUO1#_nW5>P_Demfq#cs zO8VMG_5>P_<1}D4V&m`?b^Ydr5)J~Y(o~~Y;dBYklK;f_neL8a`XTwO*BS8!6m8mQH{jU z5sng}e0oFc9|)7{w&9`5GJot z_}`o?hO)Y7k}K1x=*>Xj?4%lc5KF3KibUNLWlp@B*71ddqZ~?rH?`j|vL%{|3bTJ7 zoDeKv6@+*cb|Jla#g2g~Q=_y^oXa>dW{-ol%||qGe2HDW095|~oI{~xI4j$T_}h-- zJrbtSieDLbbeG=3tL5IAIe~8#BDiaOew;PLa+EBoM%r^U7q8w^tcXKSQ)avh2?=Zq z=hhe!$GikP5{lgT#Z5Lnf)iPzU_6Eqd+>q4RM?17S-dPeA=E}gX$3a=&2*#;z;ur5 zFm%lZCQ(N*7eG|hNaDiN-x(O5l?_y;N+wJ#Ot5!okBoCbv;%#ol{gu40Fj>m03Aa{ zw6M4+)SSZrE~yqHUgJTUbXpcE6)6s4iD#51YYGt6Oh^6jR>gXaK_k96e>qG_ro?P` z?y(M;svd2&(#D`<3kaaqbaeS&IKlu}t4kAB_49xaP0eIJ1KZ_sa@O618uJKW-!MSv zp==r<#I?Q*aiAJnR}J$tJtjo2DFg%#v1sVTNS9b04UK?K%H!B3)~y^CzMJEaHH3OW+*UG>Cib^m#@sYY#1*vi``3dmVvTNCQSc2ZKCqiE zp!+Mq%^K_L5p}>tu4w{@dGU9PkF7$*DyG$U-&pL--i#FMX$j{xNeo(AZ{D=fF7tB% zs}iC+3eS&N7>(5gYgJo1jSz1bEE_;qy^Y z+?pQUI5KUN3`&U$*p`=goJFCa)dg1_hWV8HQGkF&R$as$vnbTJbQITKh#ex~F6N?R z;L@Uy^M;_=;#Y2e(Bug{m6WyRDLW%{m- zPU30aR%y3>pPX7q3TK6-AFDF5yQ#2=(@)0Ftdz38Utu>tVZ5YT0(t3EwGDP*W>&Ja z0_@uvy*XYiJeaEQt#!#entiK_L3}N;8pWIV#GUAbCc;;q@u4`B@PUa-8g=+{P>2xL z$R%}Wb(9&95e=O|e>g)g^M#0AH4Xm&Ibj-we*NAyM+dJ z5MJHZ&=7WW7EnmH+}bYeb)wuULDA3(A7WJ5&0(M(G(a9lqXSoX=GMs(DbnhjtMQTr zLttcp?$Y&eN9+@D(MUvF8rRNV7UEF5cSeC{yabNYIz|J>le2~pC>Y{s3O1O&OpJs3 zv7*pT3GXIGwi=ozz$Hgl#zI&Cvv5Pc7_ktFLV`vuri1qq#&WhM9IJ&G7!=4f%2w4Ft7xW5|4rvgKA9YOUs zw<2M)9jraFpy@QZT)KEz{1sp~jM#&j1W3+`A|M%EXTXfUinE&(dzv!3Ecz2vRCR{H z!|v3paJc|A&o|a4PM@9I1t6=ssU{s-rV6?`D$}L%WMq>{qTnu)oO_Dx2bEy2Fc0&* zqlVXnfCF$kCyRt-GU%`eOo^tPp+Gr+oY5dZ1T-YX&D!HYUpAIDo(;qu?M-sh7CMoeHUx$n{-N9gxn>4cdzZpvgC74^w!{-H_nj~8| zDFc0VjYm?HZG02k-D}Pr^e;OHYn=S97g#IlfRdyWLvY_yBqj8>UtTT;PP#!hlT@8J++L{~5o{^x^XEndS4Q%Y;IPs1xJ>fE(!?J>LfHp9YA1~rzK!s|oF@P| zEo+Ld-#fuB3krZoTBP5d;{nFh!BY6C`pA%^;t;3G-B$^Uh5@ncr6;@ZA{6r$s7+W8 zxwjh_)CY!#gjt1g1ro@X3F`PfVjWDz-MZ2YxmZ)M(j}aG4~$|olTvi0W}2OIyOlsd z2w!I46!xLeK-S3KmiWO=6x;#+6JCszlohqb(z2fEdx?h?1r=A8m;K{qV63NL4P8yT zjXdCvtzgit+rW zOti6&204ap;BiaJcAIJ_B%j z)}J4YBk6%*t&&9xx(2m~5HABkK4CvMH_`ANbSzNV>3;E&6is2mfc{H$yerM#j01#7 zjnMe!QoXZ)ghGfR8t)Kyy~f4Bb=S;zt(cyoP{a`E&4XJfmXN2iA`Rkur{zEv9>GWD zygP3KuewyK{E8T<4L~up0YyX^yXPGwGA<)1DY*64Zbef@0##5pldmoZLD|cs0q_^r zvNx(hBMK8%cSAB7aD|m{NgC7*+lGwJO4is{L%ld{LjX{kh!TQ25@9g0RjiAJ3#~Ai zvW9hG;2wN0d}19W3<@-PPxIYi9#({Kk54Op44)Htsnqm#esIlpjvmo1 zfm8y|gZ^=P+f`Vid|u9r^Mux=A}$$KdGmZ?IId|pufr*?Mj$Py^`VULP#&`maPJ^6 zTcca%AV0xlN2z?ybH+AIjS%%byXnF{aRET0pcXsbJ;Ii=1z9a@Y6A2_5xS1B z#oFvC2YU z7|6}802}!3YLz90S_C(r~v<(*tfBH%v&e1W{>ieUj1 z3bl8*V!KH`K&PkV&HU#bilPK{Hp#u;j2ie_h=Q#=&T|w=Q&p-u#qjf=1aT05APf7! zXP|&(_yadO>m=cGV%>@GI3Fy6)4+J)4etQ?EdYB$mTaA~2R5vkSyiwtuK34cp_Cni z$jKL1=PAen&{n5z`^+jJs)-QN!)nX(g+dUtK#=Hd*L9Ngv^L?=@HUwmxSdV-8ZvsA zK}w2>_(ayv&K1O^d{lG^M&^JNkI100bi*a(YH!C8nCp!&e z-W1xa7SXU&n1rb-WDuGLqvVuvl#H7bsu4qW0jv_*=Cnk#F)i7f#yz!0f{`U5_1sDf z0z|NytRXdaYa@1th3KaDXA%TAkD97U01*L)rV-18k)<@qsp`BntVMDI#3>uOc^(^= zNMr_rkJ|SjQL%X#zDwf-d$|V2VSK9mq`+8A=tUL&tpi`o~Tp zadc~39FrjucBq@*PVgj%QHZ6h@IQG8(g)W^Lr&(lbZZw{Ca|09E`nj?e)C2$02*D7h4T5XH}z`T zFxRb~=f(&bd4i-oZXb-DW5f)U`4Soq<<0kKYK+n5zai4cGu1b5qR zO=BKsqMU_5fef(R4UiO`ty}`%*3zQ7s_*9q#&yi1lTseMiexJnQZ*mNt9NSTSJra1lWyqyvG3MPa!!tsy*HV zINVQ^9}qCm6u02_h>=Z^*tGlxG@&8aLVnd-i3G524Byd)(G;{2r1e$Ht`lf&XTARb z1_=(9(m|f9zp#@w&Da1fODtim{?OTCesR)fhl?~`u(sgVYA^(LJnqi(Ct#OzK!oyd z&i-=QKuGL|@0!hK$Ve;~e!TYi$2bi)NkwjGW!4v1tXye%v#bNUG-WLs_YAeRDb$_y zw+ezlvXVc0)W$HfDKt8DtXHt0BFH&$PHU_YLL5kL0Pk1?9is{9;p+^{PzfdZCGtBQ zwCw~ZpqxWQo-)jA7J&4!^LodSwxA6g(Y8qK-Z>rDhU7|zx50&D`6$7g1I>4tKY;, 2011-06-03. # +#, fuzzy msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,19 +17,19 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:678 perllib/FixMyStreet/DB/Result/Problem.pm:680 perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/DB/Result/Problem.pm:678 perllib/FixMyStreet/DB/Result/Problem.pm:680 perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "" -#: templates/web/base/js/translation_strings.html:44 templates/web/base/report/new/category_extras.html:15 templates/web/base/report/new/councils_text_all.html:5 templates/web/base/report/new/top_message_none.html:12 templates/web/base/report/new/top_message_none.html:15 templates/web/base/report/new/top_message_some.html:12 templates/web/base/report/new/top_message_some.html:9 +#: templates/web/base/js/translation_strings.html:50 templates/web/base/report/new/category_extras.html:15 templates/web/base/report/new/councils_text_all.html:5 templates/web/base/report/new/top_message_none.html:12 templates/web/base/report/new/top_message_none.html:15 templates/web/base/report/new/top_message_some.html:12 templates/web/base/report/new/top_message_some.html:9 msgid " or " msgstr "" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "" @@ -36,7 +37,7 @@ msgstr "" msgid "%d to %d of %d" msgstr "" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -137,7 +138,7 @@ msgstr "" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "" @@ -145,11 +146,11 @@ msgstr "" msgid "(optional)" msgstr "" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "" @@ -158,11 +159,11 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 perllib/FixMyStreet/App/Controller/Report/New.pm:711 perllib/FixMyStreet/DB/Result/Problem.pm:386 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 perllib/FixMyStreet/App/Controller/Report/New.pm:710 perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -170,7 +171,7 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -182,11 +183,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -210,11 +211,11 @@ msgstr "" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -234,18 +235,18 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 templates/web/base/admin/body-form.html:139 templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 templates/web/base/admin/bodies/index.html:78 templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "" @@ -265,7 +266,7 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "" @@ -277,23 +278,23 @@ msgstr "" msgid "Add phone number" msgstr "" -#: templates/web/base/report/_item.html:10 templates/web/base/report/_item.html:16 templates/web/base/report/_main.html:143 templates/web/base/report/_main.html:24 templates/web/base/report/_main.html:35 +#: templates/web/base/report/_item.html:10 templates/web/base/report/_item.html:16 templates/web/base/report/_main.html:149 templates/web/base/report/_main.html:25 templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 templates/web/base/admin/users.html:48 templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 templates/web/base/admin/users/index.html:48 templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -301,7 +302,7 @@ msgstr "" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -329,7 +330,7 @@ msgstr "" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 templates/web/base/dashboard/index.html:40 templates/web/base/dashboard/index.html:51 templates/web/base/dashboard/index.html:64 templates/web/base/reports/_list-filters.html:4 +#: templates/web/base/dashboard/index.html:40 templates/web/base/dashboard/index.html:51 templates/web/base/dashboard/index.html:64 templates/web/base/reports/_list-filters.html:4 msgid "All" msgstr "" @@ -365,11 +366,15 @@ msgstr "" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -385,7 +390,7 @@ msgstr "" msgid "Anonymous user" msgstr "" -#: templates/web/base/admin/report_edit.html:130 templates/web/base/admin/report_edit.html:199 templates/web/base/admin/update_edit.html:23 templates/web/base/admin/update_edit.html:96 +#: templates/web/base/admin/report_edit.html:130 templates/web/base/admin/update_edit.html:23 templates/web/base/admin/update_edit.html:96 templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "" @@ -393,23 +398,23 @@ msgstr "" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" -#: templates/web/base/admin/report_edit.html:85 templates/web/base/admin/template_edit.html:91 templates/web/base/js/translation_strings.html:90 templates/web/base/report/display_tools.html:6 +#: templates/web/base/admin/report_edit.html:85 templates/web/base/admin/template_edit.html:91 templates/web/base/js/translation_strings.html:96 templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 templates/web/base/admin/body.html:20 templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 templates/web/base/admin/bodies/form.html:77 templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -429,11 +434,11 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "" @@ -445,7 +450,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -461,7 +466,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -481,11 +486,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -493,19 +498,19 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 perllib/FixMyStreet/Cobrand/Default.pm:743 perllib/FixMyStreet/Cobrand/Zurich.pm:410 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:56 templates/web/zurich/header.html:49 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 perllib/FixMyStreet/Cobrand/Default.pm:735 perllib/FixMyStreet/Cobrand/Zurich.pm:408 templates/web/base/admin/bodies/index.html:1 templates/web/base/admin/report_edit.html:56 templates/web/zurich/header.html:49 msgid "Bodies" msgstr "" -#: templates/web/base/admin/flagged.html:17 templates/web/base/admin/index.html:63 templates/web/base/admin/reports.html:15 templates/web/base/admin/user_import.html:25 templates/web/base/admin/user_import.html:48 templates/web/base/admin/users.html:18 +#: templates/web/base/admin/flagged.html:17 templates/web/base/admin/index.html:63 templates/web/base/admin/reports.html:15 templates/web/base/admin/users/import.html:25 templates/web/base/admin/users/import.html:48 templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -521,7 +526,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 templates/web/base/admin/responsepriorities/list.html:8 templates/web/base/admin/templates.html:7 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 templates/web/base/admin/responsepriorities/list.html:8 templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -529,7 +534,7 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/contact-form.html:19 templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/dashboard/index.html:100 templates/web/base/report/_inspect.html:69 templates/web/base/report/_item.html:97 templates/web/base/report/new/category.html:14 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats/index.html:26 templates/web/zurich/admin/stats/index.html:71 +#: templates/web/base/admin/bodies/body.html:73 templates/web/base/admin/bodies/contact-form.html:19 templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/dashboard/index.html:100 templates/web/base/report/_inspect.html:72 templates/web/base/report/_item.html:64 templates/web/base/report/new/category.html:22 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/bodies/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats/index.html:26 templates/web/zurich/admin/stats/index.html:71 msgid "Category" msgstr "" @@ -537,7 +542,7 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -545,7 +550,7 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/report_edit.html:126 templates/web/base/admin/report_edit.html:201 templates/web/base/dashboard/index.html:39 templates/web/zurich/admin/contact-form.html:8 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100 +#: templates/web/base/admin/report_edit.html:126 templates/web/base/dashboard/index.html:39 templates/web/base/report/update/moderation_diff.html:7 templates/web/zurich/admin/bodies/contact-form.html:8 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100 msgid "Category:" msgstr "" @@ -565,11 +570,11 @@ msgstr "" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -580,17 +585,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -622,7 +627,11 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 perllib/FixMyStreet/Cobrand/Zurich.pm:158 perllib/FixMyStreet/Cobrand/Zurich.pm:161 perllib/FixMyStreet/DB/ResultSet/State.pm:71 templates/web/base/admin/states/index.html:103 templates/web/base/admin/states/index.html:27 templates/web/base/admin/states/index.html:33 templates/web/base/dashboard/index.html:117 templates/web/zurich/admin/stats/index.html:52 +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 perllib/FixMyStreet/Cobrand/Zurich.pm:156 perllib/FixMyStreet/Cobrand/Zurich.pm:159 perllib/FixMyStreet/DB/ResultSet/State.pm:71 templates/web/base/admin/states/index.html:103 templates/web/base/admin/states/index.html:27 templates/web/base/admin/states/index.html:33 templates/web/base/dashboard/index.html:117 templates/web/zurich/admin/stats/index.html:52 msgid "Closed" msgstr "" @@ -654,15 +663,15 @@ msgstr "" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Zurich.pm:424 templates/web/base/admin/config_page.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 perllib/FixMyStreet/Cobrand/Zurich.pm:422 templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "" @@ -678,7 +687,7 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/contact-form.html:56 templates/web/base/admin/user-alerts.html:10 templates/web/zurich/admin/contact-form.html:35 templates/web/zurich/admin/stats/index.html:61 +#: templates/web/base/admin/bodies/contact-form.html:56 templates/web/base/admin/users/alerts.html:10 templates/web/zurich/admin/bodies/contact-form.html:35 templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "" @@ -703,7 +712,11 @@ msgstr "" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -711,11 +724,11 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "" @@ -723,7 +736,7 @@ msgstr "" msgid "Council" msgstr "" -#: templates/web/base/admin/body.html:1 templates/web/base/admin/category_edit.html:1 templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 templates/web/base/admin/bodies/body.html:2 templates/web/base/admin/bodies/category.html:1 templates/web/base/admin/bodies/category.html:2 templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "" @@ -751,7 +764,7 @@ msgstr "" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "" @@ -759,15 +772,15 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -779,7 +792,7 @@ msgstr "" msgid "Created" msgstr "" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -799,11 +812,11 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 templates/web/base/admin/index.html:17 +#: templates/web/base/admin/bodies/index.html:9 templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 templates/web/zurich/admin/report_edit-sdm.html:105 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -827,27 +840,27 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 templates/web/base/admin/template_edit.html:91 templates/web/zurich/admin/template_edit.html:33 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 templates/web/base/admin/template_edit.html:91 templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 templates/web/base/admin/contact-form.html:58 templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 templates/web/base/admin/bodies/index.html:31 templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "" -#: templates/web/base/report/_main.html:119 templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -859,15 +872,15 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 templates/web/base/js/translation_strings.html:42 templates/web/zurich/report/new/fill_in_details_form.html:45 +#: templates/web/base/admin/users/alerts.html:12 templates/web/base/js/translation_strings.html:45 templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" -#: templates/web/base/admin/report_edit.html:119 templates/web/base/admin/report_edit.html:197 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit.html:31 templates/web/zurich/admin/report_edit.html:45 +#: templates/web/base/admin/report_edit.html:119 templates/web/base/report/update/moderation_diff.html:3 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit.html:31 templates/web/zurich/admin/report_edit.html:45 msgid "Details:" msgstr "" @@ -875,7 +888,7 @@ msgstr "" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -883,23 +896,23 @@ msgstr "" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -908,7 +921,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -916,7 +929,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -924,19 +937,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -944,23 +957,23 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" -#: templates/web/base/admin/list_updates.html:44 templates/web/base/admin/problem_row.html:43 templates/web/base/admin/responsepriorities/list.html:28 templates/web/base/admin/templates.html:31 templates/web/base/admin/users.html:34 templates/web/zurich/admin/problem_row.html:49 templates/web/zurich/admin/templates.html:20 +#: templates/web/base/admin/list_updates.html:44 templates/web/base/admin/problem_row.html:43 templates/web/base/admin/responsepriorities/list.html:28 templates/web/base/admin/templates.html:31 templates/web/base/admin/users/index.html:34 templates/web/zurich/admin/problem_row.html:49 templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:141 templates/web/base/admin/index.html:39 templates/web/zurich/admin/body.html:47 +#: templates/web/base/admin/bodies/body.html:142 templates/web/base/admin/index.html:39 templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -968,15 +981,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -992,19 +1005,19 @@ msgstr "" msgid "Editing update %d" msgstr "" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:27 templates/web/base/admin/category_edit.html:28 templates/web/base/admin/flagged.html:38 templates/web/base/admin/user_import.html:24 templates/web/base/admin/user_import.html:47 templates/web/base/admin/users.html:17 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:14 templates/web/zurich/auth/general.html:37 +#: templates/web/base/admin/bodies/category.html:29 templates/web/base/admin/bodies/index.html:27 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users/import.html:24 templates/web/base/admin/users/import.html:47 templates/web/base/admin/users/index.html:17 templates/web/zurich/admin/bodies/body.html:15 templates/web/zurich/admin/bodies/form.html:9 templates/web/zurich/auth/general.html:14 templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "" -#: templates/web/base/admin/contact-form.html:38 templates/web/base/alert/_list.html:74 templates/web/base/auth/change_email.html:37 templates/web/base/report/new/form_user_loggedin.html:39 templates/web/base/report/update/form_user_loggedin.html:25 +#: templates/web/base/admin/bodies/contact-form.html:38 templates/web/base/alert/_list.html:74 templates/web/base/auth/change_email.html:37 templates/web/base/report/new/form_user_loggedin.html:39 templates/web/base/report/update/form_user_loggedin.html:25 msgid "Email address" msgstr "" @@ -1028,32 +1041,32 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:146 templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/report_edit.html:146 templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1061,7 +1074,7 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1069,14 +1082,14 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1084,7 +1097,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1104,10 +1117,6 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "" @@ -1116,11 +1125,11 @@ msgstr "" msgid "Error" msgstr "" -#: templates/web/base/reports/_list-filters.html:47 templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "" @@ -1132,11 +1141,11 @@ msgstr "" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1152,7 +1161,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1172,19 +1181,19 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 templates/web/base/admin/reportextrafields/edit.html:1 templates/web/base/admin/reportextrafields/index.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 templates/web/base/admin/reportextrafields/edit.html:1 templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 templates/web/base/admin/report_edit.html:129 templates/web/base/admin/report_edit.html:202 templates/web/base/admin/update_edit.html:97 +#: templates/web/base/admin/bodies/contact-form.html:159 templates/web/base/admin/report_edit.html:129 templates/web/base/admin/update_edit.html:97 templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:165 templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1204,11 +1213,11 @@ msgstr "" msgid "Filter report list" msgstr "" -#: templates/web/base/questionnaire/index.html:66 +#: templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1224,7 +1233,7 @@ msgstr "" msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:96 templates/web/base/admin/responsepriorities/edit.html:53 templates/web/zurich/admin/body-form.html:35 +#: templates/web/base/admin/bodies/form.html:96 templates/web/base/admin/responsepriorities/edit.html:53 templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "" @@ -1232,7 +1241,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "" @@ -1240,7 +1249,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1248,7 +1257,7 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:150 templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/report_edit.html:150 templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "" @@ -1264,7 +1273,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1276,11 +1285,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1292,7 +1301,7 @@ msgstr "" msgid "Generate token" msgstr "" -#: templates/web/base/around/_updates.html:3 templates/web/base/report/display_tools.html:14 +#: templates/web/base/around/_updates.html:3 templates/web/base/report/display_tools.html:14 templates/web/base/report/new/duplicate_suggestions.html:32 templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "" @@ -1316,7 +1325,7 @@ msgstr "" msgid "Glad to hear it’s been fixed!" msgstr "" -#: templates/web/base/admin/index.html:28 templates/web/base/admin/index.html:34 templates/web/base/admin/index.html:49 templates/web/base/alert/index.html:37 templates/web/base/around/postcode_form.html:16 templates/web/base/reports/_list-filters.html:66 templates/web/base/reports/_list-filters.html:81 templates/web/base/reports/_list-filters.html:87 templates/web/base/reports/index.html:89 templates/web/zurich/admin/stats/index.html:37 +#: templates/web/base/admin/index.html:28 templates/web/base/admin/index.html:34 templates/web/base/admin/index.html:49 templates/web/base/alert/index.html:37 templates/web/base/around/postcode_form.html:16 templates/web/base/reports/_list-filters.html:71 templates/web/base/reports/_list-filters.html:86 templates/web/base/reports/_list-filters.html:92 templates/web/base/reports/index.html:89 templates/web/zurich/admin/stats/index.html:37 msgid "Go" msgstr "" @@ -1324,7 +1333,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1332,7 +1341,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1376,11 +1385,11 @@ msgstr "" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1400,7 +1409,7 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 templates/web/base/around/display_location.html:68 templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 templates/web/base/around/display_location.html:69 templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "" @@ -1416,11 +1425,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "" @@ -1428,7 +1437,7 @@ msgstr "" msgid "How to report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "" @@ -1444,11 +1453,11 @@ msgstr "" msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: templates/web/base/admin/flagged.html:14 templates/web/base/admin/index.html:60 templates/web/base/admin/list_updates.html:6 templates/web/base/admin/reports.html:12 templates/web/base/admin/user-alerts.html:8 templates/web/zurich/admin/index-dm.html:21 templates/web/zurich/admin/index-sdm.html:19 templates/web/zurich/admin/list_updates.html:24 templates/web/zurich/admin/list_updates.html:38 templates/web/zurich/admin/reports.html:11 +#: templates/web/base/admin/flagged.html:14 templates/web/base/admin/index.html:60 templates/web/base/admin/list_updates.html:6 templates/web/base/admin/reports.html:12 templates/web/base/admin/users/alerts.html:8 templates/web/zurich/admin/index-dm.html:21 templates/web/zurich/admin/index-sdm.html:19 templates/web/zurich/admin/list_updates.html:24 templates/web/zurich/admin/list_updates.html:38 templates/web/zurich/admin/reports.html:11 msgid "ID" msgstr "" -#: templates/web/base/admin/body-form.html:32 templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1470,13 +1479,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1488,6 +1497,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1514,31 +1527,31 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "" @@ -1546,7 +1559,7 @@ msgstr "" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1558,7 +1571,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1574,15 +1587,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1590,7 +1603,7 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1598,11 +1611,11 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1622,7 +1635,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 templates/web/base/admin/reportextrafields/edit.html:45 +#: templates/web/base/admin/bodies/_translations.html:6 templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1634,7 +1647,7 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "" @@ -1650,15 +1663,15 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/admin/report_edit.html:200 templates/web/base/report/_inspect.html:36 templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 templates/web/base/report/_item.html:60 templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1666,7 +1679,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "" @@ -1702,15 +1715,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 templates/web/base/report/form/user.html:22 +#: templates/web/base/js/translation_strings.html:82 templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -1718,23 +1731,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -1742,15 +1755,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "" @@ -1766,19 +1779,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -1786,7 +1799,7 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 templates/web/base/admin/update_edit.html:92 templates/web/base/report/_main.html:79 templates/web/base/report/_update_state.html:19 +#: templates/web/base/admin/update_edit.html:92 templates/web/base/report/_main.html:85 templates/web/base/report/_update_state.html:19 templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -1802,15 +1815,15 @@ msgstr "" msgid "Month" msgstr "" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 templates/web/base/admin/body-form.html:24 templates/web/base/admin/extra-metadata-form.html:75 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:62 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reportextrafields/edit.html:11 templates/web/base/admin/reportextrafields/index.html:6 templates/web/base/admin/reports.html:14 templates/web/base/admin/responsepriorities/list.html:6 templates/web/base/admin/states/index.html:108 templates/web/base/admin/states/index.html:11 templates/web/base/admin/user_import.html:23 templates/web/base/admin/user_import.html:46 templates/web/base/admin/users.html:16 templates/web/base/report/form/user_name.html:2 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:43 templates/web/zurich/report/new/fill_in_details_form.html:59 +#: templates/web/base/admin/bodies/form.html:24 templates/web/base/admin/bodies/index.html:25 templates/web/base/admin/extra-metadata-form.html:75 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/index.html:62 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reportextrafields/edit.html:11 templates/web/base/admin/reportextrafields/index.html:6 templates/web/base/admin/reports.html:14 templates/web/base/admin/responsepriorities/list.html:6 templates/web/base/admin/states/index.html:108 templates/web/base/admin/states/index.html:11 templates/web/base/admin/users/import.html:23 templates/web/base/admin/users/import.html:46 templates/web/base/admin/users/index.html:16 templates/web/base/report/form/user_name.html:2 templates/web/zurich/admin/bodies/form.html:4 templates/web/zurich/auth/general.html:43 templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "" -#: templates/web/base/admin/report_edit.html:135 templates/web/base/admin/responsepriorities/edit.html:13 templates/web/base/admin/update_edit.html:34 templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 templates/web/zurich/admin/stats/index.html:62 +#: templates/web/base/admin/report_edit.html:135 templates/web/base/admin/responsepriorities/edit.html:13 templates/web/base/admin/update_edit.html:34 templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "" @@ -1818,11 +1831,11 @@ msgstr "" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -1834,7 +1847,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 perllib/FixMyStreet/Geocode/Address.pm:17 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -1856,11 +1869,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "" @@ -1892,23 +1905,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -1916,7 +1929,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -1948,11 +1961,11 @@ msgstr "" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -1964,7 +1977,7 @@ msgstr "" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:133 templates/web/base/admin/report_edit.html:96 templates/web/base/admin/update_edit.html:26 templates/web/base/admin/user-alerts.html:21 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:39 templates/web/base/report/_inspect.html:113 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 templates/web/base/admin/bodies/category.html:5 templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:133 templates/web/base/admin/report_edit.html:96 templates/web/base/admin/update_edit.html:26 templates/web/base/admin/users/alerts.html:21 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:39 templates/web/base/report/_inspect.html:116 msgid "No" msgstr "" @@ -1972,11 +1985,7 @@ msgstr "" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "" @@ -1984,7 +1993,7 @@ msgstr "" msgid "No council selected" msgstr "" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "" @@ -2000,11 +2009,11 @@ msgstr "" msgid "No further updates" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2012,11 +2021,11 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "" -#: templates/web/base/admin/body-form.html:68 templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2030,13 +2039,13 @@ msgstr "" msgid "None" msgstr "" -#: templates/web/base/admin/user-form.html:76 templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2056,11 +2065,11 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:75 templates/web/base/admin/category_edit.html:31 templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 templates/web/base/admin/bodies/category.html:32 templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "" @@ -2084,15 +2093,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2100,19 +2109,19 @@ msgstr "" msgid "Old state" msgstr "" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 perllib/FixMyStreet/Cobrand/Zurich.pm:156 perllib/FixMyStreet/DB/ResultSet/State.pm:70 templates/web/base/admin/states/index.html:102 templates/web/base/admin/states/index.html:25 templates/web/base/admin/states/index.html:32 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:116 templates/web/zurich/admin/update_edit.html:18 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 perllib/FixMyStreet/Cobrand/Zurich.pm:154 perllib/FixMyStreet/DB/ResultSet/State.pm:70 templates/web/base/admin/states/index.html:102 templates/web/base/admin/states/index.html:25 templates/web/base/admin/states/index.html:32 templates/web/base/admin/update_edit.html:30 templates/web/base/dashboard/index.html:116 templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2120,7 +2129,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2152,7 +2161,7 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 perllib/FixMyStreet/App/Controller/Report/New.pm:712 perllib/FixMyStreet/App/Controller/Report/New.pm:713 perllib/FixMyStreet/App/Controller/Report/New.pm:748 perllib/FixMyStreet/App/Controller/Report/New.pm:751 perllib/FixMyStreet/DB/Result/Problem.pm:605 perllib/FixMyStreet/DB/Result/Problem.pm:612 perllib/FixMyStreet/DB/Result/Problem.pm:627 perllib/FixMyStreet/DB/Result/Problem.pm:636 perllib/FixMyStreet/Script/Reports.pm:182 perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 perllib/FixMyStreet/App/Controller/Report/New.pm:711 perllib/FixMyStreet/App/Controller/Report/New.pm:712 perllib/FixMyStreet/App/Controller/Report/New.pm:747 perllib/FixMyStreet/App/Controller/Report/New.pm:750 perllib/FixMyStreet/DB/Result/Problem.pm:605 perllib/FixMyStreet/DB/Result/Problem.pm:612 perllib/FixMyStreet/DB/Result/Problem.pm:627 perllib/FixMyStreet/DB/Result/Problem.pm:636 perllib/FixMyStreet/Script/Reports.pm:192 perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "" @@ -2176,7 +2185,7 @@ msgstr "" msgid "Page Not Found" msgstr "" -#: templates/web/base/admin/body-form.html:39 templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "" @@ -2188,19 +2197,19 @@ msgstr "" msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2216,15 +2225,15 @@ msgstr "" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:143 templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 templates/web/zurich/admin/stats/index.html:60 +#: templates/web/base/admin/report_edit.html:143 templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "" -#: templates/web/base/admin/report_edit.html:198 templates/web/base/admin/update_edit.html:95 templates/web/base/questionnaire/index.html:78 templates/web/base/questionnaire/index.html:93 templates/web/base/questionnaire/index.html:95 templates/web/base/report/new/form_report.html:29 templates/web/base/report/new/form_report.html:44 templates/web/base/report/new/form_report.html:46 templates/web/base/report/update/form_update.html:22 templates/web/base/report/update/form_update.html:24 templates/web/base/report/update/form_update.html:7 templates/web/zurich/admin/index-dm.html:29 templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/reports.html:16 templates/web/zurich/admin/stats/index.html:58 templates/web/zurich/report/new/fill_in_details_form.html:20 templates/web/zurich/report/new/fill_in_details_form.html:36 templates/web/zurich/report/new/fill_in_details_form.html:38 +#: templates/web/base/admin/update_edit.html:95 templates/web/base/questionnaire/index.html:78 templates/web/base/questionnaire/index.html:93 templates/web/base/questionnaire/index.html:95 templates/web/base/report/new/form_report.html:29 templates/web/base/report/new/form_report.html:44 templates/web/base/report/new/form_report.html:46 templates/web/base/report/update/form_update.html:22 templates/web/base/report/update/form_update.html:24 templates/web/base/report/update/form_update.html:7 templates/web/base/report/update/moderation_diff.html:4 templates/web/zurich/admin/index-dm.html:29 templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/reports.html:16 templates/web/zurich/admin/stats/index.html:58 templates/web/zurich/report/new/fill_in_details_form.html:20 templates/web/zurich/report/new/fill_in_details_form.html:36 templates/web/zurich/report/new/fill_in_details_form.html:38 msgid "Photo" msgstr "" @@ -2232,7 +2241,7 @@ msgstr "" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2256,10 +2265,14 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" @@ -2272,11 +2285,11 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 perllib/FixMyStreet/DB/Result/User.pm:220 perllib/FixMyStreet/DB/Result/User.pm:221 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:7 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 perllib/FixMyStreet/DB/Result/User.pm:220 perllib/FixMyStreet/DB/Result/User.pm:221 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:7 msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 perllib/FixMyStreet/App/Controller/Report/New.pm:1003 perllib/FixMyStreet/App/Controller/Report/New.pm:968 perllib/FixMyStreet/DB/Result/Problem.pm:388 templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 perllib/FixMyStreet/App/Controller/Report/New.pm:1003 perllib/FixMyStreet/App/Controller/Report/New.pm:968 perllib/FixMyStreet/DB/Result/Problem.pm:388 templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "" @@ -2284,7 +2297,7 @@ msgstr "" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 templates/web/base/admin/template_edit.html:13 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 templates/web/base/admin/bodies/body.html:12 templates/web/base/admin/bodies/index.html:4 templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2299,71 +2312,71 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 perllib/FixMyStreet/DB/Result/Comment.pm:149 templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 perllib/FixMyStreet/DB/Result/Comment.pm:149 templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 perllib/FixMyStreet/DB/Result/User.pm:223 perllib/FixMyStreet/DB/Result/User.pm:224 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:4 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 perllib/FixMyStreet/DB/Result/User.pm:223 perllib/FixMyStreet/DB/Result/User.pm:224 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:4 msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" -#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:29 templates/web/base/js/translation_strings.html:26 +#: templates/web/base/auth/change_password.html:26 templates/web/base/auth/change_password.html:29 templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 perllib/FixMyStreet/DB/Result/Problem.pm:371 templates/web/base/js/translation_strings.html:7 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 perllib/FixMyStreet/DB/Result/Problem.pm:371 templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 perllib/FixMyStreet/App/Controller/Admin.pm:1568 perllib/FixMyStreet/App/Controller/Admin.pm:329 perllib/FixMyStreet/DB/Result/User.pm:213 templates/web/base/js/translation_strings.html:19 templates/web/base/js/translation_strings.html:23 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 perllib/FixMyStreet/DB/Result/User.pm:213 templates/web/base/js/translation_strings.html:22 templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Alert.pm:355 perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Alert.pm:355 perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:374 templates/web/base/js/translation_strings.html:9 +#: perllib/FixMyStreet/DB/Result/Problem.pm:374 templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 perllib/FixMyStreet/DB/Result/User.pm:211 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:8 templates/web/base/auth/change_email.html:24 templates/web/base/auth/change_email.html:26 templates/web/base/js/translation_strings.html:18 templates/web/base/js/translation_strings.html:22 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 perllib/FixMyStreet/DB/Result/User.pm:211 templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:8 templates/web/base/auth/change_email.html:24 templates/web/base/auth/change_email.html:26 templates/web/base/js/translation_strings.html:21 templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 perllib/FixMyStreet/DB/Result/Comment.pm:146 perllib/FixMyStreet/DB/Result/Problem.pm:382 perllib/FixMyStreet/DB/Result/User.pm:206 templates/web/base/js/translation_strings.html:13 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 perllib/FixMyStreet/DB/Result/Comment.pm:146 perllib/FixMyStreet/DB/Result/Problem.pm:382 perllib/FixMyStreet/DB/Result/User.pm:206 templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "" -#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:6 templates/web/base/js/translation_strings.html:32 +#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:6 templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "" @@ -2387,7 +2400,7 @@ msgstr "" msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" -#: perllib/FixMyStreet/App/Controller/Auth.pm:410 templates/web/base/js/translation_strings.html:29 +#: perllib/FixMyStreet/App/Controller/Auth.pm:410 templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2411,11 +2424,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2447,15 +2460,15 @@ msgstr "" msgid "Please state whether or not the problem has been fixed" msgstr "" -#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 perllib/FixMyStreet/App/Model/PhotoSet.pm:154 perllib/FixMyStreet/App/Model/PhotoSet.pm:156 templates/web/base/js/translation_strings.html:71 +#: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 perllib/FixMyStreet/App/Model/PhotoSet.pm:154 perllib/FixMyStreet/App/Model/PhotoSet.pm:156 templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "" @@ -2491,11 +2504,11 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2507,10 +2520,14 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 templates/web/base/admin/contact-form.html:75 templates/web/base/admin/report_edit.html:152 templates/web/base/report/_inspect.html:13 templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/admin/bodies/body.html:89 templates/web/base/admin/bodies/contact-form.html:75 templates/web/base/admin/report_edit.html:152 templates/web/base/report/_inspect.html:16 templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2531,7 +2548,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "" @@ -2539,7 +2556,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 templates/web/base/admin/flagged.html:10 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -2563,7 +2580,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 perllib/FixMyStreet/Cobrand/UK.pm:270 msgid "Problems within %s" msgstr "" @@ -2584,7 +2601,7 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 templates/web/base/report/duplicate-no-updates.html:3 templates/web/base/report/update-form.html:9 +#: templates/web/base/report/duplicate-no-updates.html:3 templates/web/base/report/update-form-wrapper.html:3 templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" @@ -2608,7 +2625,7 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -2628,7 +2645,7 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -2644,11 +2661,11 @@ msgstr "" msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:157 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:157 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2656,7 +2673,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 perllib/FixMyStreet/Cobrand/UK.pm:220 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" msgstr "" @@ -2672,6 +2689,14 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." msgstr "" @@ -2689,11 +2714,11 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -2705,7 +2730,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -2717,7 +2742,7 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/report/_item.html:12 templates/web/base/report/_item.html:9 templates/web/base/report/_main.html:141 templates/web/base/report/_main.html:23 templates/web/base/report/_main.html:31 +#: templates/web/base/report/_item.html:12 templates/web/base/report/_item.html:9 templates/web/base/report/_main.html:147 templates/web/base/report/_main.html:24 templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -2741,15 +2766,15 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" -#: templates/web/base/header_logo.html:2 templates/web/base/js/translation_strings.html:80 templates/web/base/main_nav_items.html:6 templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 templates/web/zurich/nav_over_content.html:4 +#: templates/web/base/header_logo.html:2 templates/web/base/js/translation_strings.html:86 templates/web/base/main_nav_items.html:6 templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:81 templates/web/base/main_nav_items.html:4 +#: templates/web/base/js/translation_strings.html:87 templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -2757,7 +2782,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:82 templates/web/base/main_nav_items.html:2 templates/web/base/tokens/confirm_problem.html:40 +#: templates/web/base/js/translation_strings.html:88 templates/web/base/main_nav_items.html:2 templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" msgstr "" @@ -2785,15 +2810,15 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:616 templates/web/base/contact/index.html:58 +#: perllib/FixMyStreet/DB/Result/Problem.pm:616 templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" -#: templates/web/base/admin/stats/questionnaire.html:5 templates/web/base/questionnaire/index.html:64 +#: templates/web/base/admin/stats/questionnaire.html:5 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:640 templates/web/base/contact/index.html:60 +#: perllib/FixMyStreet/DB/Result/Problem.pm:640 templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -2833,19 +2858,19 @@ msgstr "" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:3 templates/web/base/around/lookup_by_ref.html:3 templates/web/base/js/translation_strings.html:53 templates/web/base/report/new/fill_in_details.html:0 templates/web/base/report/new/fill_in_details.html:8 templates/web/zurich/report/new/fill_in_details_form.html:4 +#: templates/web/base/around/index.html:3 templates/web/base/around/lookup_by_ref.html:3 templates/web/base/js/translation_strings.html:59 templates/web/base/report/new/fill_in_details.html:0 templates/web/base/report/new/fill_in_details.html:10 templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 perllib/FixMyStreet/Cobrand/Default.pm:674 perllib/FixMyStreet/Cobrand/Zurich.pm:402 templates/web/base/dashboard/index.html:107 templates/web/zurich/header.html:45 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 perllib/FixMyStreet/Cobrand/Default.pm:666 perllib/FixMyStreet/Cobrand/Zurich.pm:400 templates/web/base/dashboard/index.html:107 templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -2857,7 +2882,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -2869,15 +2894,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -2885,11 +2910,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -2925,19 +2950,19 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -2949,11 +2974,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 perllib/FixMyStreet/App/Controller/Admin.pm:2161 templates/web/base/admin/report_edit.html:166 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/report_edit.html:118 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 perllib/FixMyStreet/App/Controller/Admin.pm:1093 templates/web/base/admin/report_edit.html:166 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 templates/web/base/admin/report_edit.html:167 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/report_edit.html:119 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 templates/web/base/admin/report_edit.html:167 templates/web/base/admin/update_edit.html:72 templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -2961,15 +2986,15 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 templates/web/base/maps/google-ol.html:2 +#: templates/web/base/js/translation_strings.html:64 templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:58 templates/web/base/admin/template_edit.html:87 templates/web/base/report/_inspect.html:209 templates/web/base/report/_main.html:123 templates/web/base/report/update.html:56 templates/web/zurich/admin/contact-form.html:49 templates/web/zurich/admin/template_edit.html:29 +#: templates/web/base/admin/bodies/contact-form.html:156 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:58 templates/web/base/admin/template_edit.html:87 templates/web/base/report/_inspect.html:212 templates/web/base/report/_main.html:129 templates/web/base/report/update.html:58 templates/web/zurich/admin/bodies/contact-form.html:49 templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -2977,12 +3002,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -2990,7 +3015,7 @@ msgstr "" msgid "Search Reports" msgstr "" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "" @@ -2998,7 +3023,7 @@ msgstr "" msgid "Search reports" msgstr "" -#: templates/web/base/admin/reports.html:5 templates/web/base/admin/users.html:8 templates/web/zurich/admin/reports.html:5 +#: templates/web/base/admin/reports.html:5 templates/web/base/admin/users/index.html:8 templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" @@ -3006,7 +3031,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3018,15 +3043,15 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 templates/web/base/admin/users/form.html:84 templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "" @@ -3046,15 +3071,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3062,7 +3087,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3086,7 +3111,7 @@ msgstr "" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3094,7 +3119,7 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/main_nav_items.html:18 templates/web/base/report/_main.html:143 templates/web/base/report/_main.html:26 templates/web/base/report/_main.html:34 +#: templates/web/base/main_nav_items.html:18 templates/web/base/report/_main.html:149 templates/web/base/report/_main.html:27 templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3102,11 +3127,11 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 templates/web/base/report/_main.html:25 templates/web/base/report/_main.html:30 templates/web/base/reports/_list-filters.html:24 +#: templates/web/base/report/_main.html:147 templates/web/base/report/_main.html:26 templates/web/base/report/_main.html:31 templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" -#: templates/web/base/report/_item.html:15 templates/web/base/report/_main.html:151 +#: templates/web/base/report/_item.html:15 templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3118,7 +3143,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "" @@ -3130,19 +3155,19 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 templates/web/base/around/display_location.html:66 templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 templates/web/base/around/display_location.html:67 templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3178,7 +3203,7 @@ msgstr "" msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:40 templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3193,6 +3218,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3209,7 +3242,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 perllib/FixMyStreet/Geocode/OSM.pm:52 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." msgstr "" @@ -3225,7 +3258,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3235,15 +3268,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3251,15 +3284,15 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 templates/web/base/admin/category_edit.html:29 templates/web/base/admin/contact-form.html:53 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:64 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/admin/template_edit.html:53 templates/web/base/admin/templates.html:8 templates/web/base/admin/user-alerts.html:11 templates/web/base/dashboard/index.html:101 templates/web/base/report/_inspect.html:103 templates/web/base/report/_item.html:101 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/contact-form.html:33 +#: templates/web/base/admin/bodies/body.html:74 templates/web/base/admin/bodies/category.html:30 templates/web/base/admin/bodies/contact-form.html:53 templates/web/base/admin/flagged.html:18 templates/web/base/admin/index.html:64 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:16 templates/web/base/admin/template_edit.html:53 templates/web/base/admin/templates.html:8 templates/web/base/admin/users/alerts.html:11 templates/web/base/dashboard/index.html:101 templates/web/base/report/_inspect.html:106 templates/web/base/report/_item.html:68 templates/web/base/report/update/form_update.html:41 templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:102 templates/web/base/report/_update_state.html:7 +#: perllib/FixMyStreet/Script/Alerts.pm:102 templates/web/base/report/_update_state.html:7 templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3267,11 +3300,11 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 perllib/FixMyStreet/Cobrand/Zurich.pm:423 templates/web/base/admin/states/index.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 perllib/FixMyStreet/Cobrand/Zurich.pm:421 templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 perllib/FixMyStreet/Cobrand/Zurich.pm:405 templates/web/base/admin/index.html:71 templates/web/base/admin/stats/index.html:1 templates/web/base/admin/stats/state.html:1 templates/web/zurich/admin/stats/index.html:1 templates/web/zurich/header.html:58 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 perllib/FixMyStreet/Cobrand/Zurich.pm:403 templates/web/base/admin/index.html:71 templates/web/base/admin/stats/index.html:1 templates/web/base/admin/stats/state.html:1 templates/web/zurich/admin/stats/index.html:1 templates/web/zurich/header.html:58 msgid "Stats" msgstr "" @@ -3279,7 +3312,7 @@ msgstr "" msgid "Status" msgstr "" -#: templates/web/base/report/_update_state.html:22 templates/web/base/report/updates.html:16 +#: templates/web/base/report/_update_state.html:22 templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3291,7 +3324,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3299,11 +3332,11 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "" -#: templates/web/base/admin/report_edit.html:117 templates/web/base/admin/report_edit.html:196 templates/web/zurich/admin/report_edit.html:41 +#: templates/web/base/admin/report_edit.html:117 templates/web/base/report/update/moderation_diff.html:2 templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" @@ -3311,7 +3344,7 @@ msgstr "" msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:180 templates/web/base/admin/report_edit.html:25 templates/web/base/admin/update_edit.html:82 templates/web/base/admin/user-form.html:195 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:265 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/base/admin/report_edit.html:180 templates/web/base/admin/report_edit.html:25 templates/web/base/admin/update_edit.html:82 templates/web/base/admin/users/form.html:197 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:265 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -3323,7 +3356,7 @@ msgstr "" msgid "Submitted" msgstr "" -#: templates/web/base/alert/_list.html:77 templates/web/base/alert/_list.html:80 templates/web/base/alert/updates.html:23 templates/web/base/report/display_tools.html:51 +#: templates/web/base/alert/_list.html:77 templates/web/base/alert/_list.html:80 templates/web/base/alert/updates.html:23 templates/web/base/report/display_tools.html:47 templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -3331,19 +3364,27 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 perllib/FixMyStreet/Cobrand/Zurich.pm:401 templates/web/base/admin/bodies.html:29 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:42 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 perllib/FixMyStreet/Cobrand/Zurich.pm:399 templates/web/base/admin/bodies/index.html:29 templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 templates/web/base/status/index.html:3 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:42 msgid "Summary" msgstr "" @@ -3355,11 +3396,11 @@ msgstr "" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -3375,7 +3416,7 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 perllib/FixMyStreet/Cobrand/Zurich.pm:412 templates/web/base/develop/email_list.html:3 templates/web/zurich/header.html:62 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 perllib/FixMyStreet/Cobrand/Zurich.pm:410 templates/web/base/develop/email_list.html:3 templates/web/zurich/header.html:62 msgid "Templates" msgstr "" @@ -3383,7 +3424,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "" @@ -3423,7 +3464,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -3435,11 +3476,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "" @@ -3451,47 +3492,47 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 templates/web/base/admin/body-form.html:102 templates/web/base/admin/contact-form.html:104 templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 templates/web/base/admin/bodies/contact-form.html:105 templates/web/base/admin/bodies/form.html:101 templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -3501,7 +3542,7 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -3515,11 +3556,11 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 perllib/FixMyStreet/App/Controller/Reports.pm:58 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "" @@ -3563,7 +3604,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -3583,19 +3624,19 @@ msgstr "" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -3605,7 +3646,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -3613,7 +3658,7 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -3633,7 +3678,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -3649,7 +3694,7 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -3658,7 +3703,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -3674,32 +3719,32 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 perllib/FixMyStreet/App/Controller/Report/New.pm:1078 perllib/FixMyStreet/App/Controller/Report/New.pm:1095 perllib/FixMyStreet/App/Controller/Report/New.pm:1141 perllib/FixMyStreet/Cobrand/UK.pm:45 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 perllib/FixMyStreet/App/Controller/Report/New.pm:1081 perllib/FixMyStreet/App/Controller/Report/New.pm:1127 perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -3715,7 +3760,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -3731,11 +3780,15 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 perllib/FixMyStreet/Cobrand/Zurich.pm:143 templates/web/zurich/report/_main.html:14 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 perllib/FixMyStreet/Cobrand/Zurich.pm:141 templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3755,7 +3808,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -3763,7 +3816,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 templates/web/base/admin/timeline.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3795,7 +3848,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3819,31 +3872,31 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:155 templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" -#: templates/web/base/auth/2faform.html:6 templates/web/base/auth/smsform.html:17 templates/web/base/js/translation_strings.html:38 +#: templates/web/base/auth/2faform.html:6 templates/web/base/auth/smsform.html:17 templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "" @@ -3859,15 +3912,15 @@ msgstr "" msgid "Two-factor authentication has been deactivated" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:54 templates/web/base/admin/states/index.html:10 templates/web/base/admin/states/index.html:100 templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/extra-metadata-form.html:54 templates/web/base/admin/states/index.html:10 templates/web/base/admin/states/index.html:100 templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 templates/web/base/admin/contact-form.html:55 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:66 templates/web/zurich/admin/report_edit.html:94 templates/web/zurich/admin/update_edit.html:18 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 templates/web/base/admin/bodies/contact-form.html:55 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:66 templates/web/zurich/admin/report_edit.html:94 templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -3879,7 +3932,7 @@ msgstr "" msgid "Unknown alert type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:119 perllib/FixMyStreet/App/Controller/Root.pm:142 templates/web/base/js/translation_strings.html:49 +#: perllib/FixMyStreet/App/Controller/Photo.pm:119 perllib/FixMyStreet/App/Controller/Root.pm:142 templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "" @@ -3887,7 +3940,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -3899,7 +3952,7 @@ msgstr "" msgid "Up one" msgstr "" -#: templates/web/base/admin/states/index.html:76 templates/web/base/admin/user-alerts.html:58 templates/web/base/report/update/form_update.html:31 +#: templates/web/base/admin/states/index.html:76 templates/web/base/admin/users/alerts.html:58 templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -3907,15 +3960,15 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -3939,7 +3992,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -3955,7 +4008,7 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 perllib/FixMyStreet/App/Controller/Admin.pm:1498 perllib/FixMyStreet/App/Controller/Admin.pm:1708 perllib/FixMyStreet/App/Controller/Admin.pm:1977 perllib/FixMyStreet/App/Controller/Admin.pm:999 perllib/FixMyStreet/Cobrand/Zurich.pm:807 perllib/FixMyStreet/Cobrand/Zurich.pm:832 perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 perllib/FixMyStreet/App/Controller/Admin.pm:915 perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 perllib/FixMyStreet/Cobrand/Zurich.pm:805 perllib/FixMyStreet/Cobrand/Zurich.pm:830 perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "" @@ -3976,11 +4029,11 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -3990,15 +4043,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4006,43 +4059,43 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 templates/web/base/admin/user-form.html:34 templates/web/base/admin/users.html:32 +#: templates/web/base/admin/report_blocks.html:18 templates/web/base/admin/users/form.html:34 templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4050,15 +4103,15 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 perllib/FixMyStreet/Cobrand/Default.pm:737 perllib/FixMyStreet/Cobrand/Zurich.pm:417 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 perllib/FixMyStreet/Cobrand/Default.pm:729 perllib/FixMyStreet/Cobrand/Zurich.pm:415 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 perllib/FixMyStreet/App/Controller/Admin.pm:410 perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4086,11 +4139,11 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" -#: templates/web/base/around/display_location.html:0 templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:0 templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4122,7 +4175,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4135,7 +4188,7 @@ msgid "We show up to ten matches, please try a different search if yours is not msgstr "" #: templates/web/base/report/new/notes.html:4 templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4150,7 +4203,11 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "" @@ -4170,14 +4227,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4198,19 +4251,23 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 templates/web/base/admin/bodies.html:70 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:132 templates/web/base/admin/report_edit.html:96 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/user-alerts.html:21 templates/web/base/admin/users.html:32 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:37 templates/web/base/report/_inspect.html:111 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 templates/web/base/admin/bodies/category.html:6 templates/web/base/admin/bodies/index.html:70 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:33 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/list_updates.html:36 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:132 templates/web/base/admin/report_edit.html:96 templates/web/base/admin/update_edit.html:25 templates/web/base/admin/users/alerts.html:21 templates/web/base/admin/users/index.html:32 templates/web/base/questionnaire/index.html:104 templates/web/base/questionnaire/index.html:37 templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -4218,7 +4275,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -4230,7 +4287,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4238,7 +4295,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -4253,15 +4310,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -4321,7 +4378,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -4336,7 +4393,7 @@ msgstr "" msgid "Your account" msgstr "" -#: templates/web/base/alert/updates.html:19 templates/web/base/auth/create.html:37 templates/web/base/auth/general.html:49 templates/web/base/contact/index.html:85 templates/web/base/report/display_tools.html:46 templates/web/base/report/form/user_loggedout_email.html:7 templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/base/alert/updates.html:19 templates/web/base/auth/create.html:37 templates/web/base/auth/general.html:49 templates/web/base/contact/index.html:87 templates/web/base/report/display_tools.html:49 templates/web/base/report/form/user_loggedout_email.html:7 templates/web/base/report/new/duplicate_suggestions.html:34 templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -4349,10 +4406,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "" @@ -4368,7 +4425,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -4384,7 +4441,7 @@ msgstr "" msgid "Your password should include %d or more characters." msgstr "" -#: templates/web/base/auth/change_phone.html:19 templates/web/base/contact/index.html:92 +#: templates/web/base/auth/change_phone.html:19 templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "" @@ -4408,7 +4465,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -4424,19 +4481,19 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:7 templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/category-checkboxes.html:7 templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 perllib/FixMyStreet/App/Controller/Moderate.pm:119 perllib/FixMyStreet/DB/Result/Comment.pm:226 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 templates/web/base/admin/report_edit.html:194 templates/web/base/admin/update_edit.html:92 +#: perllib/FixMyStreet/DB/Result/Comment.pm:226 perllib/FixMyStreet/DB/Result/User.pm:297 perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 templates/web/base/admin/update_edit.html:92 templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -4468,7 +4525,7 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" -#: templates/web/base/admin/flagged.html:51 templates/web/base/admin/open311-form-fields.html:93 +#: templates/web/base/admin/bodies/open311-form-fields.html:93 templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "" @@ -4476,11 +4533,11 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:67 templates/web/zurich/report/_item.html:16 +#: templates/web/base/report/_item_small.html:22 templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "" @@ -4488,7 +4545,7 @@ msgstr "" msgid "n/a" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:8 templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/category-checkboxes.html:8 templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -4516,7 +4573,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -4524,7 +4581,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -4540,19 +4597,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -4568,11 +4625,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -4580,35 +4637,35 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -4622,14 +4679,14 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -4699,7 +4756,7 @@ msgid_plural "%s updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -4720,7 +4777,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po index 1a4ec0c565d..b7c39ebf6d0 100644 --- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,16 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 -# ButterflyOfFire ButterflyOfFire, 2019 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: ButterflyOfFire ButterflyOfFire, 2019\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Arabic (https://www.transifex.com/mysociety/teams/12067/ar/)\n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -23,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "و" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -37,11 +36,11 @@ msgstr "و" msgid " or " msgstr "أو" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d تم التعديل بواسطة %s" @@ -49,7 +48,7 @@ msgstr "%d تم التعديل بواسطة %s" msgid "%d to %d of %d" msgstr "%d إلى %d من %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -161,7 +160,7 @@ msgstr "( مثل الكتابة على الجدران ، رمي النفايات msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(لم ترسل الى الجهة المسئولة)" @@ -170,11 +169,11 @@ msgstr "(لم ترسل الى الجهة المسئولة)" msgid "(optional)" msgstr "(إختياري)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(أرسل لكليهما)" @@ -183,13 +182,13 @@ msgstr "(أرسل لكليهما)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "--إختر تصنيف--" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -197,8 +196,8 @@ msgstr "" msgid "--Choose a template--" msgstr "-اختر قالب---" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -213,11 +212,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -242,11 +241,11 @@ msgstr "لا دعني أؤكّد تحديثي بالبريد" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "ملاحظة: تم ارسال هذا التقرير للتطبيق. لن يتم ارسال اي تغييرات اخرى عليه." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "ملاحظة: لم يتم ارسال هذا التقرير للتطبيق بعد. لن يتم ارسال اي تغييرات اخرى عليه." @@ -266,8 +265,8 @@ msgstr "" msgid "Add" msgstr "إضافة" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -277,13 +276,13 @@ msgstr "" " ليتم إرسال تقارير المشكلات إليها. يمكنك إضافة جهة اتصال واحدة أو أكثر (لفئات مختلفة\n" " من المشكلة) إلى كل هيئة." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "أضف عنوان اتصال عبر النموذج التالي." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "إضافة هيئة" @@ -304,8 +303,8 @@ msgstr "إضافة حقل" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "أضف تصنيفاً" @@ -320,27 +319,27 @@ msgstr "إضافة رقم هاتف" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "اضف للقائمة القصيرة" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "إضافة مستخدم" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "اضف / عدل اصناف المشاكل" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "اضف/عدل أولويات الاستجابة" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "اضف/عدل قوالب الاستجابة" @@ -348,7 +347,7 @@ msgstr "اضف/عدل قوالب الاستجابة" msgid "Added %s" msgstr "أُضيف %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "اضافة التقرير للقائمة القصيرة خاصتك سيحذفه من %s’s القائمة القصيرة." @@ -377,7 +376,6 @@ msgstr "نبهني بأحدث المستجدات" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -424,11 +422,15 @@ msgstr "كل البلاغات بين %s و %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -447,9 +449,9 @@ msgid "Anonymous user" msgstr "مستخدم مجهول" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "مجهول:" @@ -458,29 +460,29 @@ msgstr "مجهول:" msgid "Another user" msgstr "مستخدم اخر" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "هل أنت متأكد أنك تريد إلغاء الرفع؟" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "هل أنت متأكد؟" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "المنطقة المغطاة" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "المنطقة:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "بما أن هذا الموقع هو موقع مؤقت وقيمة %s هي غير حقيقي false، فإن التقارير التي تُنشأ في هذا الموقع ستُرسل إلى المبلغ عن المشكلة وليس جهة الاتصال المحددة لفئة التقرير." @@ -501,11 +503,11 @@ msgstr "تعيين إلى هيئة خارجية:" msgid "Assign to subdivision:" msgstr "تعيين إلى قسم فرعي:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "تعيين المستخدمين للمناطق" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "عين إلى %s" @@ -517,8 +519,8 @@ msgstr "في الغالب، يتم إرجاع %d من الطلبات في كل msgid "At the moment only searching for and looking at reports work." msgstr "حاليا مايعمل هو البحث ورؤية البلاغات فقط." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "مستخدمين " @@ -534,7 +536,7 @@ msgstr "الإستجابة الآلية:" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -555,11 +557,11 @@ msgstr "تفادى المعلومات الشخصية ولوحات السيارا msgid "Awaiting moderation" msgstr "في إنتظار المشرفين" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "الخلف" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "عد إلى كل التقارير" @@ -567,10 +569,10 @@ msgstr "عد إلى كل التقارير" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -579,17 +581,17 @@ msgstr "الهيئات" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "الهيئة" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "الهيئة:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -605,7 +607,7 @@ msgstr "لا تستطيع العثور على رسالة البريد الإلك msgid "Can't see the map? Skip this step" msgstr "لا يمكنك رؤية الخريطة؟ تجاوز هذه الخطوة" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -616,15 +618,15 @@ msgstr "تصنيفات" msgid "Categories:" msgstr "تصنيفات:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -637,7 +639,7 @@ msgstr "تصنيف" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "تصنيف تغير من ‘%s’ إلى ‘%s’" @@ -647,9 +649,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "معدل إصلاحات الفئة للمشكلات التي مضى عليها أكثر من 4 أسابيع" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -676,11 +678,11 @@ msgstr "تغيير كلمة المرور" msgid "Change phone number" msgstr "تغيير رقم الهاتف" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "تفقد مطلوب الفحص اذا كانت التقارير في الفئة تستوجب الفحص قبل الارسال" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -696,7 +698,7 @@ msgstr "" "لتعرض كبلاغ. في المملكة المتحدة، نستخدمها للخدمات مثل طلب حاوية نفايات\n" "إضافية لعنوان محدد." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -704,11 +706,11 @@ msgstr "" "اختر اسم تصنيف يكون منطقيا لعامة الناس (مثل، \"أخدود\"، \"إنارة الطريق\") ومساعد.\n" "للجهات المسئولة أيضا. هذه سوف تظهر في القائمة المنسدلة من صفحة إبلاغ-عن-مشكلة." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -740,9 +742,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -786,17 +792,17 @@ msgstr "علامة تجارية مشتركة:" msgid "Code" msgstr "الرمز" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "إعدادت" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "تأكيد" @@ -817,9 +823,9 @@ msgstr "الرجاء الدخول عبر البريد الإلكتروني بد msgid "Confirmation" msgstr "تأكيد" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "مؤكد" @@ -849,7 +855,11 @@ msgstr "اتصل بفريق العمل" msgid "Continue" msgstr "المواصلة" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -858,12 +868,12 @@ msgstr "" msgid "Coordinates:" msgstr "الإحداثيات:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "لم يتمكن من إيجاد المستخدم" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "لم يتمكن من إيجاد الموقع" @@ -871,9 +881,11 @@ msgstr "لم يتمكن من إيجاد الموقع" msgid "Council" msgstr "المجلس" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "جهات اتصال المجلس لـ %s" @@ -902,8 +914,8 @@ msgstr "انشئ بلاغ" msgid "Create an account" msgstr "إنشاء حساب" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "انشء تصنيف" @@ -911,15 +923,15 @@ msgstr "انشء تصنيف" msgid "Create priority" msgstr "انشء أولوية" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "انشاء التبليغات/تحديثات كالمجلس" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "انشاء التبليغات/تحديثات بالنيابة عن مستخدم" @@ -933,7 +945,7 @@ msgstr "إنشاء قالب" msgid "Created" msgstr "تم الإنشاء" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -956,12 +968,12 @@ msgstr "الرمز الحالي:" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "حاليا لايوجد جهات مسئولة تم إنشائها." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "لا يمكن الاتصال بالعميل" @@ -989,32 +1001,32 @@ msgstr "افتراضي" msgid "Default priority" msgstr "الأهمية الافتراضية" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "حذف" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "حذف القالب" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "محذوف" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1030,18 +1042,18 @@ msgstr "الوصف" msgid "Description:" msgstr "الوصف:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "التفاصيل" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1052,7 +1064,7 @@ msgstr "التفاصيل:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "تم التحويل" @@ -1061,24 +1073,24 @@ msgstr "تم التحويل" msgid "Didn't use map" msgstr "لم يتم استخدام الخريطة" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "جدول رابطة جائزة العناية بالدقة" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "تعطيل" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "إلغاء التعديلات" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "لا ترسل اشعارات البريد الالكتروني حول التعليقات المأخوذة لصانع المشكلة" @@ -1087,7 +1099,7 @@ msgstr "لا ترسل اشعارات البريد الالكتروني حول ا msgid "Do you have a %s password?" msgstr "هل لديك كلمة مرور %s؟" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1095,7 +1107,7 @@ msgstr "" msgid "Don’t know" msgstr "لا أعلم" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "هل تحب النماذج؟" @@ -1103,19 +1115,19 @@ msgstr "هل تحب النماذج؟" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "اسحب الصور واسقطها هنا أو انقر للرفع" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "المكرَّرة" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1126,8 +1138,8 @@ msgstr "" "يمكن للتصنيفات المختلفة أن تمتلك نفس عنوان الاتصال (عنوان بريد إلكتروني).\n" "هذا يعني أنه يمكنك إضافة ما تشاء من التصنيفات حتى ولو كنت تملك عنوان اتصال واحد للجهة المسئولة." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "باتجاه الشرق /باتجاه الشمال:" @@ -1135,23 +1147,23 @@ msgstr "باتجاه الشرق /باتجاه الشمال:" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "تعديل" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "تعديل تفاصيل الجهة المسئولة" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "عدل صلاحيات المستخدمين الآخرين" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "عدل تصنيف التقرير" @@ -1159,15 +1171,15 @@ msgstr "عدل تصنيف التقرير" msgid "Edit report details" msgstr "تعديل تفاصيل الإبلاغ" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "عدل أولوية التقرير" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "عدل التقارير" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1190,28 +1202,28 @@ msgstr "تعديل المشكلة %d" msgid "Editing update %d" msgstr "تعديل التحديث %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "تعديل المستخدم %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "المحرر" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "البريد الإلكتروني" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1240,37 +1252,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "ارسل لي رابطا لكي أتمكن مِن تسجيل الدخول" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "البريد الإلكتروني المؤكد:" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "البريد الإلكتروني:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "تنشيط" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1278,8 +1290,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1291,8 +1303,8 @@ msgstr "" "لمزيد من المعلومات، راجع\n" "هذه المقالة." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1302,8 +1314,8 @@ msgstr "" "لها نقطة نهاية مختلفة (وأسلوب إرسال مختلف) عن نقطة نهاية وأسلوب إرسال الهيئة. على سبيل المثال، إذا كانت تقارير بعض فئات\n" "المشكلة يجب إرسالها عبر البريد الإلكتروني، بينما تقارير أخرى يمكن إرسالها عبر Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1311,7 +1323,7 @@ msgstr "" msgid "End Date" msgstr "تاريخ النهاية" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "نقطة النهاية" @@ -1333,10 +1345,6 @@ msgstr "أدخل أقرب صندوق بريد، أو اسم الشارع وال msgid "Enter a nearby street name and area" msgstr "أدخل أقرب اسم شارع وحي" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "أدخل تفاصيل البلاغ" @@ -1350,13 +1358,13 @@ msgstr "أدخل تفاصيل البلاغ" msgid "Error" msgstr "خطأ" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "الكل" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "مثال لصندوق البريد %s" @@ -1368,11 +1376,11 @@ msgstr "أمثلة:" msgid "Existing category" msgstr "تصنيف موجود" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1389,7 +1397,7 @@ msgstr "" msgid "External ID" msgstr "معرف خارجي" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "رابط خارجي" @@ -1410,25 +1418,25 @@ msgstr "" msgid "External team" msgstr "فريق خارجي" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "حقول إضافية" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "بيانات إضافية:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "تفاصيل إضافية" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "حقل إضافي:" @@ -1451,11 +1459,12 @@ msgstr "" msgid "Filter report list" msgstr "ترشيح قائمة البلاغات" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "أول مرة" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "يمكن إصلاح ذلك عن طريق اختيار منطقة التغطية في نموذج تحرير تفاصيل الهيئة بالأسفل." @@ -1475,9 +1484,9 @@ msgstr "تم الإصلاح - المجلس" msgid "Fixed - User" msgstr "تم الإصلاح - المستخدم" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "مشار كمحذوف" @@ -1485,8 +1494,8 @@ msgstr "مشار كمحذوف" msgid "Flag user" msgstr "مستخدم مشار إليه" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "مشار إليهم" @@ -1494,7 +1503,7 @@ msgstr "مشار إليهم" msgid "Flagged reports and users" msgstr "بلاغات ومستخدمين مشار إليهم" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "المستخدمين المشار إليهم مدرجين بقائمة في صفحة المشار إليهم" @@ -1503,7 +1512,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "المستخدمين المشار إليهم غير محظورين بأي طريقة، هذه فقط لائحة بالمستخدمين المحددين للإنتباه لهم" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "مشار إليه:" @@ -1519,7 +1528,7 @@ msgstr "لنتائج أفضل أرفق لقطة مقربة ولقطة شاملة msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "للمزيد من المعلومات، راجع كيف أصلح شارعي يستخدم الخريطة." @@ -1533,11 +1542,11 @@ msgstr "نسيت كلمتك السرية" msgid "Forgotten your password?" msgstr "هل نسيت كلمة المرور؟" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "تمت إعادة التوجيه إلى هيئة خارجية" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "تمت إعادة توجيه الطلب إلى هيئة خارجية" @@ -1553,6 +1562,8 @@ msgstr "توليد رمز" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "احصل على التحديثات" @@ -1583,9 +1594,9 @@ msgstr "سعيد لسماع أنها أصلحت!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1595,7 +1606,7 @@ msgstr "اذهب" msgid "Going to send questionnaire?" msgstr "هل تريد أن ترسل سؤال؟" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "إعطاء تصريح للأدمن" @@ -1603,7 +1614,7 @@ msgstr "إعطاء تصريح للأدمن" msgid "Graph of problem creation by status over time" msgstr "الرسم البياني للإبلاغ عن المشكلات حسب الحالة مع مرور الوقت" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1654,11 +1665,11 @@ msgstr "مخفي" msgid "Hidden Field" msgstr "حقل مخفي" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1679,9 +1690,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "أخفي المثبتة" @@ -1698,11 +1709,11 @@ msgstr "هل تريد إخفاء اسمك؟" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "السجل" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "البداية" @@ -1710,7 +1721,7 @@ msgstr "البداية" msgid "How to report a problem" msgstr "كيف تبلغ عن مشكلة" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "كيف ترسل بلاغات ناجحة" @@ -1732,7 +1743,7 @@ msgstr "نعتذر لك لم نستطع تحديد مشكلتك في قاعدة #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1741,8 +1752,8 @@ msgstr "نعتذر لك لم نستطع تحديد مشكلتك في قاعدة msgid "ID" msgstr "المعرف" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1766,7 +1777,7 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1774,7 +1785,7 @@ msgstr "" "إذا كانت توجد هيئتان أو أكثر تخدمان نفس الموقع، فإن FixMyStreet يجمع الفئات المتطابقة في إدخال واحد في\n" " القائمة. تأكد من استخدام اسم الفئة نفسها في الهيئات إذا كنت تريد حدوث ذلك." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1786,6 +1797,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "إذا حصلت على معلومات أكثر عن حالة مشكلتك, الرجاء العودة للموقع ووضع تحديث لذلك." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "اذا كنت تريد ان تكون هذه الاولوية خيارا لفئة معينة، قم باختيارها هنا. سوف تظهر لكل الفئات افتراضيا." @@ -1815,34 +1830,34 @@ msgstr "" "إذا كنت ترغب في ترك تحديث عام عن المشكلة، فالرجاء إدخاله هنا\n" "(الرجاء ملاحظة أنه لن يُرسل إلى المجلس)." -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "إذا كنت تستخدم أسلوب إرسال غير البريد الإلكتروني، فأدخل معرف الخدمة (Open311) أو المعرف المقابل له هنا." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "معرف غير صالح" @@ -1850,7 +1865,7 @@ msgstr "معرف غير صالح" msgid "Illegal feed selection" msgstr "اختيار موجز غير صالح" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "إستيراد المستخدمين" @@ -1862,7 +1877,7 @@ msgstr "في جدول المسيئين؟" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "إضافة إلى ذلك، يتم إرجاع السمات التالية التي ليست جزءًا من مواصفة Open311 v2: agency_sent_datetime وtitle (يرجع أيضًا كجزء من الوصف) وinterface_used وcomment_count وrequestor_name (يوجد إذا كان مقدم الطلب سمح بعرض الاسم على هذا الموقع)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "غير نشط" @@ -1878,15 +1893,15 @@ msgstr "تضمين البيانات الشخصية للمبلّغ" msgid "Incorrect has_photo value \"%s\"" msgstr "قيمة has_photo غير صحيحة \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "يتطلب المعاينة" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "وجه المقاولون لإصلاح المشاكل" @@ -1894,7 +1909,7 @@ msgstr "وجه المقاولون لإصلاح المشاكل" msgid "Internal notes" msgstr "ملاحظات داخلية" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1902,12 +1917,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "قيمة agency_responsible غير صالحة %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "التنسيق المحدد %s غير صالح." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "موقع غير صحيح. على الموقع الجديد ان يكون تحت نفس المجلس." @@ -1928,7 +1943,7 @@ msgstr "المفتاح" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "اللغة" @@ -1941,8 +1956,8 @@ msgstr "اللغات" msgid "Last 7 days" msgstr "على مدى الأسبوع الأخير" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "آخر محرر" @@ -1958,17 +1973,17 @@ msgstr "آخر تحديث" msgid "Last update:" msgstr "آخر تحديث:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "الاقل تحديثا مؤخرا" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "اترك هذا خاليًا إذا كان سيتم إرسال جميع التقارير إلى هذه الهيئة باستخدام نفس أسلوب الإرسال (على سبيل المثال \"%s\")." @@ -1976,7 +1991,7 @@ msgstr "اترك هذا خاليًا إذا كان سيتم إرسال جميع msgid "List" msgstr "القائمة" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "عرض جميع المشكلات المبلّغ عنها" @@ -2020,16 +2035,16 @@ msgstr "تسجيل الدخول عبر فايسبوك" msgid "Log in with Twitter" msgstr "تسجيل الدخول عبر تويتر" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "تسجيل الدخول عبر البريد الإلكتروني" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "الخروج مِن كافة الجلسات" @@ -2037,23 +2052,23 @@ msgstr "الخروج مِن كافة الجلسات" msgid "Look up" msgstr "البحث" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "الخريطة" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "ادارة القائمة القصيرة" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "ترتيب يدوي" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "الخريطة" @@ -2061,15 +2076,15 @@ msgstr "الخريطة" msgid "Mark as sent" msgstr "اشر كمرسلة" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "تحديد المستخدمين الذين تريد وضع علامة على سلوكهم بأنه مشار إليه." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "حدد تفاصيل المشكلة." -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "الرسالة" @@ -2085,19 +2100,19 @@ msgstr "رسالة إلى الهيئة الخارجية:" msgid "Missing bodies:" msgstr "هيئات مفقودة:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr " jurisdiction_id غير موجود" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "إشراف" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "قم بالاشراف على تفاصيل التبليغ" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "قم بالاشراف على التبليغ" @@ -2105,10 +2120,10 @@ msgstr "قم بالاشراف على التبليغ" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2126,12 +2141,12 @@ msgstr "سِجلّ الإشراف" msgid "Month" msgstr "الشهر" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "الأكثر تعليقا" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2143,11 +2158,11 @@ msgstr "الأكثر تعليقا" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2156,7 +2171,7 @@ msgstr "الاسم" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "الاسم:" @@ -2166,11 +2181,11 @@ msgstr "الاسم:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "انتقل الى هذه المشكلة" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "أقرب عنوان تم التعرف عليه:" @@ -2182,7 +2197,7 @@ msgstr "أقرب طريق مسمى للدبوس الموضوع على الخري msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "أقرب رمز بريدي للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا): %s (على بعد %s متر)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "أقرب شارع مسمى للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا باستخدام خرائط Bing): %s" @@ -2206,11 +2221,11 @@ msgstr "أوشكنا على الانتهاء! راجع البريد الإلكت msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "تمت إضافة هيئة جديدة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "تمت إضافة جهة اتصال جديدة للفئة" @@ -2246,23 +2261,23 @@ msgstr "رقم الهاتف الجديد:" msgid "New priority" msgstr "أولوية جديدة" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "مشاكل جديدة في %s" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2270,7 +2285,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "مشكلات جديدة للمجلس {{COUNCIL}} في دائرة {{WARD}} على FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2306,11 +2321,11 @@ msgstr "حالة جديدة" msgid "New template" msgstr "قالب جديد" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "الأحدث" @@ -2322,10 +2337,10 @@ msgstr "التالي" msgid "Next:" msgstr "التالي:" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2333,11 +2348,10 @@ msgstr "التالي:" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "لا" @@ -2345,11 +2359,7 @@ msgstr "لا" msgid "No account?" msgstr "ليس عندك حساب بعد؟" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "لاتوجد منطقة" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "لا هيئة" @@ -2357,7 +2367,7 @@ msgstr "لا هيئة" msgid "No council selected" msgstr "لم يتم تحديد مجلس" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "لم تحدث أي تعديلات." @@ -2374,11 +2384,11 @@ msgstr "لم يتم العثور على مستخدمين مشار إليهم." msgid "No further updates" msgstr "لا توجد تحديثات إضافية" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2386,12 +2396,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "لم يتم إرجاع أي نتائج" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2410,8 +2420,8 @@ msgstr "لا يوجد داعمون" msgid "None" msgstr "بلا" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." @@ -2420,8 +2430,8 @@ msgstr "" " يمكن إقران المستخدمين الموظفين المعتمدين بالمنطقةالتي يعملون فيها.
\n" " " -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2445,13 +2455,13 @@ msgstr "لم يقوموا بالإبلاغ من قبل" msgid "Not reported to council" msgstr "لم يتم إبلاغ المجلس" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "ملاحظة" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "ملاحظة:" @@ -2475,15 +2485,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "موافق" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2491,16 +2501,16 @@ msgstr "" msgid "Old state" msgstr "حالة قديمة" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "الأقدم" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2511,7 +2521,7 @@ msgstr "" msgid "Open" msgstr "مفتوح" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "API Open311 مفتاح " @@ -2519,7 +2529,7 @@ msgstr "API Open311 مفتاح " msgid "Open311 API for the mySociety FixMyStreet server" msgstr "واجهة Open311 API لخادم mySociety FixMyStreet" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "صلاحيات Open311" @@ -2551,17 +2561,17 @@ msgstr "" msgid "Order" msgstr "الترتيب" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "أخرى" @@ -2586,8 +2596,8 @@ msgstr "المالك" msgid "Page Not Found" msgstr "لم يتم العثور على الصفحة" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "العنصر الرئيسي" @@ -2601,19 +2611,19 @@ msgstr "جزئي" msgid "Password (optional)" msgstr "كلمة المرور (اختياري)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "الارتباط الثابت" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "الصلاحيات:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2633,17 +2643,16 @@ msgstr "رقم الهاتف (اختياري)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "الهاتف:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2654,6 +2663,7 @@ msgstr "الهاتف:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2668,7 +2678,7 @@ msgstr "الصورة" msgid "Photo is required." msgstr "الصورة مطلوبة." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "الصورة مطلوبة" @@ -2697,11 +2707,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "وضع دبوس على الخريطة" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "الرجاء التحلي بالأدب والاختصار والتركيز على الفكرة." @@ -2718,7 +2732,7 @@ msgstr "الرجاء التحقق من كلمات المرور وإعادة ال msgid "Please check your email address is correct" msgstr "الرجاء التحقق من أن عنوان البريد الإلكتروني صحيح" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2726,11 +2740,11 @@ msgstr "الرجاء التحقق من أن عنوان البريد الإلكت msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "الرجاء اختيار فئة" @@ -2739,8 +2753,9 @@ msgstr "الرجاء اختيار فئة" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "الرجاء تصحيح الأخطاء التالية" @@ -2759,13 +2774,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "الرجاء عدم إساءة الاستعمال؛ فإساءة استعمال المجلس يتسبب في تقليل قيمة الخدمة المقدمة لكل المستخدمين." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "الرجاء إدخال رسالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2773,90 +2788,90 @@ msgstr "الرجاء إدخال رسالة" msgid "Please enter a mobile number" msgstr "يرجى إدخال رقم هاتف خلوي" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "الرجاء إدخال اسمك" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "الرجاء ادخال اسم لهذه الهيئة." #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "الرجاء إدخال كلمة مرور" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "الرجاء إدخال موضوع" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "الرجاء إدخال بريد إلكتروني صالح" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "الرجاء إدخال عنوان بريد إلكتروني صالح" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "الرجاء إدخال بعض التفاصيل" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "الرجاء إدخال البريد الإلكتروني" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "الرجاء إدخال الاسم الأول" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "الرجاء إدخال الاسم الكامل؛ فالمجالس تحتاج هذه المعلومة - إذا كنت لا ترغب في إظهار اسمك على الموقع، فألغِ تحديد هذا المربع الموجود بالأسفل" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "الرجاء إدخال اسمك" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "الرجاء إدخال رقم الهاتف" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "الرجاء إدخال الاسم الثاني" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "الرجاء إدخال اللقب" @@ -2884,7 +2899,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "الرجاء الإشارة إلى ما إذا كنت تريد المشاركة في استبيان آخر أم لا" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2910,11 +2925,11 @@ msgstr "يرجى ملاحظة أن تحديثك لم يتم نشره ب msgid "Please note:" msgstr "الرجاء ملاحظة:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "الرجاء تقديم تحديث عام لهذا التقرير." @@ -2950,16 +2965,16 @@ msgstr "الرجاء تحديد ما إذا كانت المشكلة قد تم ح #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "الرجاء تحميل صورة فقط" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "الرجاء كتابة رسالة" @@ -2995,12 +3010,12 @@ msgstr "مشغّل بواسطة reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "سوف يتم ارسال التبليغات اوتوماتيكيا دون الحاجة لفحصها اذا كانت قيمة سمعة المستخدم تساوي او اكبر من هذه القيمة. حدد الى 0 اذا كان يجب فحص كل التبلغات بغض النظر." -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "عتبة السمعة" @@ -3502,20 +3531,20 @@ msgstr "قوالب الاستجابة" msgid "Response Templates for %s" msgstr "قوالب الاستجابة لـ %s" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "المكان صحيح؟" @@ -3527,15 +3556,15 @@ msgstr "مشغل الطرق لهذا الطريق المسمى (يتم اشتق msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "مشغل الطرق لهذا الطريق المسمى (من OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "تدوير لليسار" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3546,23 +3575,23 @@ msgstr "تدوير لليمين" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "سيؤدي تدوير هذه الصورة إلى تجاهل التغييرات غير المحفوظة في التقرير." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "القمر الصناعي" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "حفظ التغييرات" @@ -3571,12 +3600,12 @@ msgstr "حفظ التغييرات" msgid "Save new fields" msgstr "حفظ الحقول الجديدة" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "احفظ مع التحديث العام" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3586,7 +3615,8 @@ msgstr "" msgid "Search Reports" msgstr "البحث عن تقارير" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "البحث عن مستخدمين" @@ -3595,7 +3625,7 @@ msgid "Search reports" msgstr "البحث عن تقارير" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "بحث:" @@ -3605,7 +3635,7 @@ msgstr "بحث:" msgid "Searching found no reports." msgstr "لم يعثر البحث على أي تقارير." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "لم يعثر البحث عن أي مستخدمين." @@ -3621,17 +3651,18 @@ msgstr "الأمان" msgid "See our privacy policy" msgstr "انظر سياسة الخصوصية" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "تحديد هيئة" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "تحديد منطقة" @@ -3651,15 +3682,15 @@ msgstr "" msgid "Select:" msgstr "تحديد:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "إرسال" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "أرسل حالات Open311 مطولة مع تحديثات طلب الخدمة" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3668,7 +3699,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "تمت إعادة إرسال التقرير" @@ -3695,7 +3726,7 @@ msgstr "الخدمة:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "اضبط إلى موقعي الحالي" @@ -3704,9 +3735,9 @@ msgid "Share" msgstr "مشاركة" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "قائمة قصيرة" @@ -3714,15 +3745,15 @@ msgstr "قائمة قصيرة" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "تم الاضافة الى القائمة القصيرة" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "تم الاضافة الى القائمة القصيرة في %s" @@ -3734,7 +3765,7 @@ msgstr "هل تريد عرض الصورة؟" msgid "Show all updates" msgstr "عرض كافة التحديثات" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "إظهار اسمي للعامة" @@ -3746,21 +3777,21 @@ msgstr "" msgid "Show older" msgstr "عرض الأقدَم" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "عرض التقارير القديمة" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "عرض الصورة" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "إظهار الدبابيس" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3803,8 +3834,8 @@ msgstr "تسجيل الخروج" msgid "Some categories may require additional information." msgstr "بعض التصنيفات قد تتطلب معلومات إضافية." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3821,6 +3852,14 @@ msgstr "بعض صور التقارير الحديثة" msgid "Some text to localize" msgstr "بعض النص لترجمته" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "عذرًا، يبدو هذا أنه رمز بريدي خاص بإحدى تبعيات التاج البريطاني، ونحن لا نغطي ذلك." @@ -3838,7 +3877,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "عذرًا، حدث خطأ أثناء تأكيد المشكلة." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3860,7 +3899,7 @@ msgstr "عذرًا، لم نستطع تحليل ذلك الموقع. الرجا msgid "Sorry, we couldn't save your image(s), please try again." msgstr "عذرًا، لم نستطع حفظ الصورة (الصور)، الرجاء إعادة المحاولة." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3870,15 +3909,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "للأسف، ليس لديك صلاحية لفعل ذلك." -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "رتب بواسطة" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "مستخدم الموظف لديه الصلاحية للدخول للأدمن" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "الموظف:" @@ -3886,31 +3925,32 @@ msgstr "الموظف:" msgid "Start Date" msgstr "تاريخ البداية" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "الحالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3923,14 +3963,14 @@ msgstr "" msgid "State:" msgstr "الحالة:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3946,7 +3986,7 @@ msgid "Status" msgstr "الحالة" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3959,7 +3999,7 @@ msgstr "عرض الشارع" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "الفئة الفرعية" @@ -3967,12 +4007,12 @@ msgstr "الفئة الفرعية" msgid "Subdivision/Body" msgstr "القسم الفرعي/الهيئة" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "الموضوع" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "الموضوع:" @@ -3990,7 +4030,7 @@ msgstr "تقديم" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -4011,7 +4051,8 @@ msgstr "تم اضافتها" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "اشتراك" @@ -4019,21 +4060,29 @@ msgstr "اشتراك" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "لخص المشكلة" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "لخص تغييراتك" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4053,11 +4102,11 @@ msgstr "ملخص التقارير" msgid "Summary statistics" msgstr "خلاصة الإحصائيات" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "مستخدم خارق" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "المستخدم الخارق له ترخيص لتنفيذ strong>كل اعمال التي يمكن للأدمن عملها." @@ -4075,8 +4124,8 @@ msgstr "حدثنا عنك" msgid "Template «%s»" msgstr "القالب «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4086,7 +4135,7 @@ msgstr "القوالب" msgid "Text" msgstr "النص" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "إصدار نصي فقط" @@ -4130,7 +4179,7 @@ msgstr "شكرًا لك، يسعدنا معرفة أن المشكلة قد حُ msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "يبدو أنه لم يتم تحميل هذه الصورة بصورة سليمة (%s)، الرجاء إعادة المحاولة." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "لا يبدو أن هذا الموقع ضمن صلاحيات المجلس؛ ربما يكون موقعًا بحريًا أو خارج حدود المحافظة. الرجاء إعادة المحافظة." @@ -4144,11 +4193,11 @@ msgstr "لا يبدو أن هذا الموقع يقع في المملكة الم msgid "That postcode was not recognised, sorry." msgstr "لم يتم التعرف على هذا الرمز البريدي، عذرًا." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "تم وضع علامة على هذه المشكلة بأنها أُرسلت." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "ستتم إعادة إرسال هذه المشكلة الآن." @@ -4160,23 +4209,23 @@ msgstr "لا يمكن عرض هذا التقرير على %s." msgid "That report has been removed from FixMyStreet." msgstr "تمت إزالة هذا التقرير من FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4184,8 +4233,8 @@ msgstr "" "عنوان البريد الإلكتروني هو الوجهة التي يتم إرسال التقارير المتعلقة بهذه الفئة إليها. \n" " قد تكون الفئات الأخرى لهذه الهيئة معينًا لها نفس عنوان البريد الإلكتروني." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4193,15 +4242,15 @@ msgstr "" "نقطة النهاية هي عنوان URL للخدمة التي سيتصل بها نظام FixMyStreet \n" " عند إرسال التقارير إلى هذه الهيئة." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." @@ -4209,10 +4258,10 @@ msgstr "" "الصلاحية القضائية مطلوب تحديدها فقط إذا كانت نقطة النهاية تخدم أكثر من\n" " واحدة. إذا كانت الهيئة تدير نقطة النهاية الخاصة بها، فيمكن ترك هذا الحقل خاليًا." -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4224,8 +4273,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "خاصية Open311 v2 التالية: agency_responsible، تُستخدم لعرض الإدارات التي استلمت تقرير المشكلة، وعادةً ليست هذه هي طريقة تعريف السمة في مواصفة Open311 v2." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4242,12 +4291,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "لن يتمكن المجلس من تقديم المساعدة ما لم تترك كثيرًا من التفاصيل بقدر الإمكان. الرجاء تحديد موقع المشكلة بالضبط (على سبيل المثال، على الحائط)، ونوع المشكلة، والفترة الزمنية للمشكلة، ووصف للمشكلة (على سبيل المثال صورة للمشكلة إن كانت متوفرة)، إلخ." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "يعرض جدول رابطة جائزة العناية بالدقة نشاط المحررين (الأشخاص الذين يحررون معظم السجلات)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "الخطأ هو: %s" @@ -4293,7 +4342,7 @@ msgstr "المشكلات الأخيرة المبلغ عنها ضمن حدود {{ msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "من المحتمل أن الارتباط انتهت صلاحيته، أو ربما لم يتم نسخه ولصقه بصورة سليمة." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "يتم توفير قائمة المناطق المتاحة بواسطة خدمة MapIt في %s." @@ -4314,20 +4363,20 @@ msgstr "لم يتم العثور على عنوان URL '%s' على هذا الخ msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "تعذر على المستخدم تحديد موقع المشكلة على الخريطة، ولكن يجب البحث عن المنطقة حول الموقع الذي أدخله" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4341,7 +4390,11 @@ msgstr "" msgid "There are no reports to show." msgstr "لا توجد تقارير لعرضها." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4349,8 +4402,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "حدثت مشكلة أثناء عرض صفحة \"كل التقارير\". الرجاء إعادة المحاولة لاحقًا." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "حدثت مشكلة أثناء عرض هذه الصفحة. الرجاء إعادة المحاولة لاحقًا." @@ -4372,7 +4425,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "حدثت مشكلة مع تحديثك. الرجاء المحاولة مرة آخرى." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "حدثت مشكلات في التقرير. الرجاء الاطلاع على ما يلي." @@ -4389,8 +4442,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4404,7 +4457,7 @@ msgstr "" " this article.\n" " " -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4422,7 +4475,7 @@ msgstr " سوف يتم ارسال هذه الى %sو سوف ي msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "تنفيذ API هذا هو عمل قيد التنفيذ ولم يستقر حتى الآن. وسيتغير بدون تحذيرات في المستقبل." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4432,12 +4485,12 @@ msgstr "" " بالتالي، لن تظهر أي فئة من فئاتها في القائمة المنسدلة للفئات عندما يبلغ المستخدمون عن المشكلات.\n" " في الوقت الحالي، لا يستطيع المستخدمون الإبلاغ عن المشكلات إلى هذه الهيئة." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "لا توجد جهات اتصال لهذه الهيئة. هذا يعني أن المشكلات المبلغ عنها حاليًا إلى هذه الهيئة لن تُرسل." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4445,18 +4498,17 @@ msgstr "" "ستُرسل إلى هذه الهيئة تقارير المشكلات التي تقع في منطقة التغطية فقط.\n" " لن تتلقى الهيئة أي تقارير ما لم تكن تغطي منطقة واحدة على الأقل." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "أُرسلت رسالة البريد الإلكتروني إلى كلا المجلسين اللذين يغطيان موقع المشكلة، وبما أن المستخدم لم يحدد فئة المشكلة، فالرجاء تجاهلها إذا لم تكن المجلس المختص بمعالجة هذه المشكلة، أو أعلمنا بفئة المشكلة لنضيفها إلى النظام." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "أُرسلت رسالة البريد الإلكتروني إلى عدة مجالس تغطي موقع المشكلة، وبما أن الفئة المحددة مدخلة لجميع المجالس، فالرجاء تجاهل المشكلة إذا لم تكن المجلس المختص بالتعامل معها." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "هذه المعلومات مطلوبة" @@ -4473,7 +4525,11 @@ msgstr "هذا موقع مطور، وقد تتعطل الأمور في أي وق msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4489,12 +4545,16 @@ msgstr "لم يتم إصلاح هذه المشكلة" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "هذا التقرير في انتظار اعتماد الإشراف." @@ -4515,7 +4575,7 @@ msgstr "هذا التقرير عليه علامة \"مفتوح\" حاليًا." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "تحتوي صفحة الويب هذه على صورة للمشكلة، تم تقديمها بواسطة المستخدم." @@ -4526,7 +4586,7 @@ msgstr "تحتوي صفحة الويب هذه على صورة للمشكلة، msgid "Time spent (in minutes):" msgstr "الوقت المستغرق (بالدقائق):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "المخطط الزمني" @@ -4564,7 +4624,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "لعرض خريطة موضح عليها الموقع الدقيق لهذه المشكلة" @@ -4593,34 +4653,34 @@ msgstr "" msgid "Total" msgstr "الإجمالي" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "هل يتطلب إدارة المرور؟" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "الترجمة" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "الترجمات" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "موثوق من الهيئات:" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "موثوق به لأنشاء تبليغات بدون الحاجة الى تدقيقها" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "موثوق:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "أعد المحاولة" @@ -4639,16 +4699,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4666,7 +4726,7 @@ msgstr "نوع تنبيه غير معروف" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "خطأ غير معروف" @@ -4679,7 +4739,7 @@ msgstr "خطأ غير معروف" msgid "Unknown problem ID" msgstr "معرف المشكلة غير معروف" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4692,7 +4752,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "تحديث" @@ -4701,16 +4761,16 @@ msgstr "تحديث" msgid "Update %s created for problem %d; by %s" msgstr "تم إنشاء تحديث %s للمشكلة %d؛ بواسطة %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "تمت إضافة التحديث التالي بدون تحديد الهوية في %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "تمت إضافة التحديث التالي بواسطة %s في %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "نص التحديث" @@ -4735,7 +4795,7 @@ msgstr "أدى التحديث إلى وضع علامة على المشكلة ب msgid "Update reopened problem" msgstr "أدى التحديث إلى إعادة فتح المشكلة" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "حالات التحديث" @@ -4753,14 +4813,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "تم التحديث!" @@ -4785,12 +4845,12 @@ msgstr "التحديثات على {{title}}" msgid "Updates to this problem, %s" msgstr "التحديثات على هذه المشكلة، %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4800,15 +4860,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "استخدم ملحق Open311 لأرسال الاحداثيات" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "استخدم هذا الحقب لتسجيل التفاصيل التي لا تُعرض إلا في الإدارة. لا تُعرض المدخلات بصورة عامة، ولا تُرسل إلى الهيئة." @@ -4817,48 +4877,48 @@ msgstr "استخدم هذا الحقب لتسجيل التفاصيل التي ل msgid "Used map" msgstr "تم استخدام الخريطة" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "التعليق المأخوذ ينتمي الى مستخدم معرف" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "تمت إزالة إشارة المستخدم" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "تم وضع إشارة للمستخدم" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "عثر البحث الذي نفذه المستخدم على مطابقات في أسماء المستخدمين وعناوين البريد الإلكتروني." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4867,20 +4927,20 @@ msgstr "" msgid "User:" msgstr "المستخدم:" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "المستخدمون" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "يمكن للمستخدمين تنفيذ الاوامر التاليه في مناطقهم او هيئاتهم المعينة." -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "تم تحديث القيم" @@ -4914,12 +4974,12 @@ msgstr "عرض التقارير حسب الدائرة" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "عرض موقع" @@ -4954,7 +5014,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "نحتاج إلى بريدك الإلكتروني، يرجى كتابته بالأسفل." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "نعتقد أن هذه المشكلة هي المسؤولة عن %s؛ ولكن لا توجد لدينا أي تفاصيل اتصال لهم. إذا كنت تعرف عنوان اتصال مناسبًا، فالرجاء التواصل معنا." @@ -4969,8 +5029,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "لن نستخدم معلوماتك الشخصية إلا وفقًا لسياسة الخصوصية." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4984,8 +5044,12 @@ msgstr "موقع الويب" msgid "We’ll get back to you as soon as we can." msgstr "سنعود إليك بأسرع ما يمكن." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "عند التحرير" @@ -5005,14 +5069,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "ثلاث صور تكفي." - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "لماذا تتوقف هنا؟ يمكنك إعداد مزيد من التنبيهات مجانًا." @@ -5033,15 +5093,19 @@ msgstr "هل تريد المساهمة في FixMyStreet؟ التعليمات ا msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "هل تريد المشاركة في استبيان آخر خلال 4 أسابيع فنذكرك بالتحقق من الحالة؟" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "كتابة الرسالة بالأحرف الكبيرة يجعل قراءتها صعبة، وكذلك الحال مع عدم الالتزام بقواعد الترقيم." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5050,20 +5114,19 @@ msgstr "كتابة الرسالة بالأحرف الكبيرة يجعل قرا #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "نعم" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "أنت تشتكي من أن تقرير هذه المشكلة تم تعديله بواسطة الإشراف دون ضرورة لذلك:" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "إنك غير متصل" @@ -5071,7 +5134,7 @@ msgstr "إنك غير متصل" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "أنت تبلغ عن تقرير المشكلة التالي بأنه يشتمل على إساءة أو يحتوي على معلومات شخصية أو شيء من هذا القبل:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "أنت تبلغ عن التحديث التالي بأنه يشتمل على إساءة أو يحتوي على معلومات شخصية أو شيء من هذا القبيل:" @@ -5084,7 +5147,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "يمكنك عرض المشكلة على هذا الموقع." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "يمكنك إضافة البريد الإلكتروني الخاصة بالمستخدم المسيء إلى قائمة المسيئين، وهي تخفي تلقائيًا (ولا ترسل مطلقًا) التقارير التي يقومون بإنشائها." @@ -5092,7 +5155,7 @@ msgstr "يمكنك إضافة البريد الإلكتروني الخاصة ب msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "يمكنك التواصل مع الدعم الفني عبر %s" @@ -5113,15 +5176,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "يمكنك مساعدتنا في العثور على عنوان بريد إلكتروني لجهة اتصال للمشكلات المحلية المتعلقة بـ %s وإرساله إلينا عبر البريد الإلكتروني على %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "يمكنك وضع علامة الحذف على هيئة إذا كنت لا تريدها نشطة على الموقع." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "لقد رفضت؛ الرجاء تعبئة المربع بالأعلى" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5187,7 +5250,7 @@ msgstr "لم تقم باضافة أي تقارير الى القائمة الق msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "أنت بحاجة إلى إضافة بعض الهيئات (مثل المجالس أو الإدارات) قبل أن تتمكن من إرسال أي تقارير." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5212,9 +5275,10 @@ msgstr "حسابك" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "البريد الإلكتروني" @@ -5230,10 +5294,10 @@ msgid "Your email or mobile" msgstr "بريدك الإلكتروني أو رقم هاتفك الخلوي" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "لن يتم استخدام معلوماتك إلا وفقًا لسياسة الخصوصية الخاصة بنا" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "الاسم" @@ -5249,7 +5313,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "تم اخفاء اسمك" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5272,7 +5336,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "رقم الهاتف" @@ -5297,7 +5361,7 @@ msgstr "" msgid "Your update" msgstr "تحديثك" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5314,25 +5378,24 @@ msgstr "" msgid "Yourself" msgstr "نفسك" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "مدير" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "الكل" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "مدير" @@ -5366,8 +5429,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "تحرير المستخدم" @@ -5376,12 +5439,12 @@ msgstr "تحرير المستخدم" msgid "from %s different users" msgstr "من %s من المستخدمين المختلفين" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "آخر تحديث %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "أقل من دقيقة واحدة" @@ -5392,7 +5455,7 @@ msgid "n/a" msgstr "غير متاح" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "بلا" @@ -5432,7 +5495,7 @@ msgstr "المُدخل في الأصل: “%s”" msgid "other areas:" msgstr "مناطق أخرى:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "عرض" @@ -5440,7 +5503,7 @@ msgstr "عرض" msgid "sign out" msgstr "تسجيل الخروج" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5457,19 +5520,19 @@ msgstr "لا يوجد دبوس مما يعني أن المستخدم لم يست msgid "this location" msgstr "هذا الموقع" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "هذا النوع من المشكلة المحلية" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "اليوم" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "تحديث" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "تحديثات" @@ -5485,11 +5548,11 @@ msgstr "المستخدم من نفس المجلس مثل المشكلة - %d" msgid "user is problem owner" msgstr "المستخدم هو صاحب المشكلة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5498,7 +5561,7 @@ msgstr "" msgid "ward" msgstr "الإدارة" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5509,7 +5572,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5520,7 +5583,7 @@ msgstr[3] "%d من الأيام" msgstr[4] "%d من الأيام" msgstr[5] "%d من الأيام" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5531,7 +5594,7 @@ msgstr[3] "%d من الساعات" msgstr[4] "%d من الساعات" msgstr[5] "%d من الساعات" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5542,7 +5605,7 @@ msgstr[3] "%d من الدقائق" msgstr[4] "%d من الدقائق" msgstr[5] "%d من الدقائق" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5564,7 +5627,7 @@ msgstr[3] "%d من الداعمين" msgstr[4] "%d من الداعمين" msgstr[5] "%d من الداعمين" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5575,7 +5638,7 @@ msgstr[3] "%d من الأسابيع" msgstr[4] "%d من الأسابيع" msgstr[5] "%d من الأسابيع" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5685,7 +5748,7 @@ msgstr[3] "%s من التحديثات على التقارير" msgstr[4] "%s من التحديثات على التقارير" msgstr[5] "%s من التحديثات على التقارير" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5718,7 +5781,7 @@ msgstr[3] "لا توجد لدينا تفاصيل عن المجالس التي ت msgstr[4] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." msgstr[5] "لا توجد لدينا تفاصيل عن المجالس التي تغطي هذا الموقع حتى الآن." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po index 48a18e3e791..21a998ab84c 100644 --- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/mysociety/teams/12067/bg_BG/)\n" "Language: bg_BG\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "и" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "и" msgid " or " msgstr "или" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d редиктарано от %s" @@ -48,7 +48,7 @@ msgstr "%d редиктарано от %s" msgid "%d to %d of %d" msgstr "%d до %d от %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(като графити, дупки по улицата, счупено msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(не е изпратен към общината)" @@ -163,11 +163,11 @@ msgstr "(не е изпратен към общината)" msgid "(optional)" msgstr "(незадължително)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(изпратен към двата района)" @@ -176,13 +176,13 @@ msgstr "(изпратен към двата района)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Изберете категория --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -232,11 +232,11 @@ msgstr "Не Нека потвърдя актуализация msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,8 +256,8 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -267,13 +267,13 @@ msgstr "" "район или дружество, към което могат да се изпращат проблеми. Можете да добавяте \n" "повече от един контакт (в зависимост от категорията на проблема) за всяка служба." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Добавете контакт като използвате формата по-долу." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Добавете район" @@ -294,8 +294,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Добавяне на нова категория" @@ -310,27 +310,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Добавете потребител" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -338,7 +338,7 @@ msgstr "" msgid "Added %s" msgstr "Добавено %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -367,7 +367,6 @@ msgstr "Известявай ме за бъдещи актуализиации" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -414,11 +413,15 @@ msgstr "Всички сигнали между%s и %s " msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -437,9 +440,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Анонимен:" @@ -448,29 +451,29 @@ msgstr "Анонимен:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Територията е обхваната" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -491,11 +494,11 @@ msgstr "Прехвърляне към външна община:" msgid "Assign to subdivision:" msgstr "Прехвърляне към подразделение:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Прехвърлен на %s" @@ -507,8 +510,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "За момета можете само да търсите и преглеждате сигнали" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -524,7 +527,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -545,11 +548,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Очакващ преглед" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Назад" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -557,10 +560,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -569,17 +572,17 @@ msgstr "Райони" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Район" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Район:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -595,7 +598,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Не виждате картата? Пропуснете тази стъпка" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -606,15 +609,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -627,7 +630,7 @@ msgstr "Категория" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -637,9 +640,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Сигнали подадени преди повече от 4 седмици" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -666,11 +669,11 @@ msgstr "Промяна на парола" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -686,17 +689,17 @@ msgstr "" "
\n" "Тази опция е подходяща за сигнали, които всички биха могли да подават, но които не представляват интерес за останалите. Например да си изиска допълнителен контейнер за боклук за даден адрес." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Изберете име на категорията, което е смислено едновременно, както за гражданите, така и за общината. Категориите се появяват като списък за избор при подаване на сигнал. " -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -728,9 +731,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -774,17 +781,17 @@ msgstr "Местна имплементция" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфигурация" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Потвърждаване" @@ -805,9 +812,9 @@ msgstr "" msgid "Confirmation" msgstr "Потвърждение" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Потвърдено" @@ -837,7 +844,11 @@ msgstr "Връзка с тима" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -846,12 +857,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Потребителят не е намерен" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Местоположението не може да бъде намерено" @@ -859,9 +870,11 @@ msgstr "Местоположението не може да бъде намер msgid "Council" msgstr "Община" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Контакти на общината за %s " @@ -890,8 +903,8 @@ msgstr "Подай сигнал" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Създай категория" @@ -899,15 +912,15 @@ msgstr "Създай категория" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -921,7 +934,7 @@ msgstr "" msgid "Created" msgstr "Създаден" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -944,12 +957,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "В момента няма създадени Райони." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -977,32 +990,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Изтрит" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1018,18 +1031,18 @@ msgstr "Описание" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Информация" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1040,7 +1053,7 @@ msgstr "Информация:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Прехвърлен" @@ -1049,24 +1062,24 @@ msgstr "Прехвърлен" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Таблица с районите в София" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1083,7 +1096,7 @@ msgstr "" msgid "Don’t know" msgstr "Не знам" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Не обичате форми?" @@ -1091,19 +1104,19 @@ msgstr "Не обичате форми?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1115,8 +1128,8 @@ msgstr "" "(имейл адрес). Това означава, че можете да добавяте различни категории, \n" "дори и да имате само един контакт." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1124,23 +1137,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Редактиране" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Редактиране на информацията за района" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1148,15 +1161,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1179,28 +1192,28 @@ msgstr "Редактиране на сигнала %d " msgid "Editing update %d" msgstr "Редактиране на актуализацията %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Редактиране на потребителя %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Редактирано от" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Имейл" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1229,37 +1242,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Имейл:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1267,8 +1280,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1276,16 +1289,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1293,7 +1306,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1315,10 +1328,6 @@ msgstr "Въведете пощенски код или име на улица msgid "Enter a nearby street name and area" msgstr "Въведете име на улица в близост до вас" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Въведете информация за проблема" @@ -1332,13 +1341,13 @@ msgstr "Въведете информация за проблема" msgid "Error" msgstr "Грешка" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Примерен пощенски адрес %s" @@ -1350,11 +1359,11 @@ msgstr "Примери:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1371,7 +1380,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1392,25 +1401,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Допълнителни данни:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1433,11 +1442,12 @@ msgstr "" msgid "Filter report list" msgstr "Филтриране на списъка със сигнали" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "За първи път" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1457,9 +1467,9 @@ msgstr "Поправени - община" msgid "Fixed - User" msgstr "Поправени - потребител" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Означен като \"изтрит\"" @@ -1467,8 +1477,8 @@ msgstr "Означен като \"изтрит\"" msgid "Flag user" msgstr "Означаване на потребител" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Означен" @@ -1476,7 +1486,7 @@ msgstr "Означен" msgid "Flagged reports and users" msgstr "Означени сигнали и потребители" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Означените потребители са изброени на страницата с означените." @@ -1485,7 +1495,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Означените потребители нямат рестрикции. Това е списък с потребители, които са поставени под наблюдение." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Означен:" @@ -1501,7 +1511,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "За повече информацич вижте Как ПоправиСофия използва MapIt." @@ -1515,11 +1525,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Забравена парола?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1535,6 +1545,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Изтегляне на актуализациите" @@ -1565,9 +1577,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1577,7 +1589,7 @@ msgstr "Търси" msgid "Going to send questionnaire?" msgstr "Ще изпратите ли анкетата?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1585,7 +1597,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Графика на създадените сигнали по статус във времето" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1638,11 +1650,11 @@ msgstr "Скрити" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1663,9 +1675,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Скрий кабърчетата" @@ -1682,11 +1694,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "История" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Начало" @@ -1694,7 +1706,7 @@ msgstr "Начало" msgid "How to report a problem" msgstr "Как да сигнализирате за проблем" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Как да подавате сигнали успешно" @@ -1716,7 +1728,7 @@ msgstr "Вашият сигнал не беше намерен.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1725,8 +1737,8 @@ msgstr "Вашият сигнал не беше намерен.\n" msgid "ID" msgstr "№" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1748,13 +1760,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1766,6 +1778,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1793,34 +1809,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Несъществуващ номер" @@ -1828,7 +1844,7 @@ msgstr "Несъществуващ номер" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1840,7 +1856,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1856,15 +1872,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1872,7 +1888,7 @@ msgstr "" msgid "Internal notes" msgstr "Вътрешни бележки" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1880,12 +1896,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1906,7 +1922,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1919,8 +1935,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Последно редактирано от" @@ -1936,17 +1952,17 @@ msgstr "Последно обновено:" msgid "Last update:" msgstr "Последно обновено:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1954,7 +1970,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Показване на всички сигнали" @@ -1998,16 +2014,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2015,23 +2031,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "Карта" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2039,15 +2055,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Маркирайте потребители, които бихте искали да държите под око." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Съобщение" @@ -2063,19 +2079,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Липсващо jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2083,10 +2099,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2104,12 +2120,12 @@ msgstr "" msgid "Month" msgstr "Месец" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2121,11 +2137,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2134,7 +2150,7 @@ msgstr "Име" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Име:" @@ -2144,11 +2160,11 @@ msgstr "Име:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2160,7 +2176,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2184,11 +2200,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Районът е добавен" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Категорията е добавена" @@ -2224,23 +2240,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2248,7 +2264,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2284,11 +2300,11 @@ msgstr "Ново състояние" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2300,10 +2316,10 @@ msgstr "Слеващ" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2311,11 +2327,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Не" @@ -2323,11 +2338,7 @@ msgstr "Не" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Несъществуващ район" @@ -2335,7 +2346,7 @@ msgstr "Несъществуващ район" msgid "No council selected" msgstr "Не е избрана община" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Не са направени промени." @@ -2352,11 +2363,11 @@ msgstr "" msgid "No further updates" msgstr "Няма повече актуализации" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2364,12 +2375,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Няма намерени резултати" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2386,15 +2397,15 @@ msgstr "" msgid "None" msgstr "" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2414,13 +2425,13 @@ msgstr "Не съм подавал преди" msgid "Not reported to council" msgstr "Съгналът не е подаден към общината" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Бележка" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Бележка:" @@ -2444,15 +2455,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "ОК" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2460,16 +2471,16 @@ msgstr "" msgid "Old state" msgstr "Стар статус" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2480,7 +2491,7 @@ msgstr "" msgid "Open" msgstr "Отворен" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2488,7 +2499,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2520,17 +2531,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Други" @@ -2555,8 +2566,8 @@ msgstr "Собственик" msgid "Page Not Found" msgstr "Страницата не е намерена" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Община" @@ -2570,19 +2581,19 @@ msgstr "Частичен" msgid "Password (optional)" msgstr "Парола (незадължително)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Връзка" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2602,17 +2613,16 @@ msgstr "Телефонен номер (незадължително)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Телефон:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2623,6 +2633,7 @@ msgstr "Телефон:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2637,7 +2648,7 @@ msgstr "Снимка" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2666,11 +2677,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Поставете кабърче върху картата" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Моля бъдете учтиви, кратки и се придържайте към темата." @@ -2687,7 +2702,7 @@ msgstr "Моля проверете паролите и пробвайте от msgid "Please check your email address is correct" msgstr "Моля проверете дали сте въвели коректен имейл адрес" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2695,11 +2710,11 @@ msgstr "Моля проверете дали сте въвели коректе msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Моля изберете категория" @@ -2708,8 +2723,9 @@ msgstr "Моля изберете категория" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2725,13 +2741,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Моля не обиждайте никого - обиждайки Общината, Вие обезценявате услугата за всички потребители." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Моля въведете съобщение" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2739,90 +2755,90 @@ msgstr "Моля въведете съобщение" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Моля въведете парола" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Моля въведете тема" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Моля въведете валиден имейл" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Моля въведете валиден имейл адрес" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Моля въведете информация" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Моля въведете имейл" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Моля въведете име" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Моля въведете цялото си име, общината се нуждае от тази информация - ако не желаете името Ви да се появява на сайта, моля махнете отметката по-долу" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Моля въведете име" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Моля въведете фамилия" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Моля въведете фамилия" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Моля въведете обръщение" @@ -2850,7 +2866,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Моля отбележете дали бихте искали да участвате в друга анкета" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2876,11 +2892,11 @@ msgstr "" msgid "Please note:" msgstr "Забележка:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2916,16 +2932,16 @@ msgstr "Моля посочете дали проблемът е бил разр #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Моля въведете съобщение" @@ -2961,12 +2977,12 @@ msgstr "" msgid "Previous" msgstr "Предишно" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2980,14 +2996,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Лично" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Сигнал" @@ -3010,7 +3030,7 @@ msgstr "Сигналът %s е подаден към общината %s " msgid "Problem breakdown by state" msgstr "Разделяне на сигналите по статуси" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Сигналът е маркиран като отворен." @@ -3018,7 +3038,7 @@ msgstr "Сигналът е маркиран като отворен." msgid "Problem state change based on survey results" msgstr "Статусът на сигнала е променен на основата на резултат от анкета" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Сигнали" @@ -3043,7 +3063,7 @@ msgstr "Проблеми сигнализирани скоро в сайта" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3068,8 +3088,8 @@ msgstr "" msgid "Property address:" msgstr "Адрес на имота:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Въведете иформация за актуализиране" @@ -3095,7 +3115,7 @@ msgstr "" msgid "Public response:" msgstr "Публичен отговор:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3120,6 +3140,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Анкетата %d за проблем %d е изпратена" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Анкетата е попълнена от потребителя, подал сигнала" @@ -3143,11 +3164,11 @@ msgstr "RSS абонамент за квартал %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "RSS абонамент за %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "RSS абонамент за %s, в квартал %s" @@ -3155,7 +3176,7 @@ msgstr "RSS абонамент за %s, в квартал %s" msgid "RSS feed of nearby problems" msgstr "RSS абонамент за последни проблеми наоколо" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3175,6 +3196,14 @@ msgstr "RSS абонамент за последни проблеми наоко msgid "RSS feed of updates to this problem" msgstr "RSS абонамент за актуализации по този проблем" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3194,11 +3223,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Наскоро добавени сигнали" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3210,7 +3239,7 @@ msgstr "Помнете, че \"ПоправиСофия\" служи за под msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3224,9 +3253,9 @@ msgstr "Премахване на означението" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3252,20 +3281,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Подайте сигнал" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3275,7 +3304,7 @@ msgstr "" msgid "Report abuse" msgstr "Сигнализирай за неподходящо съдържание" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3309,17 +3338,18 @@ msgid "Report, view, or discuss local problems" msgstr "Сигнализирай, разгледай или коментирай проблеми" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Подавал съм и преди" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -3363,28 +3393,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Сигнализиране за проблем" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Сигнали" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3396,7 +3426,7 @@ msgstr "Сигнали чакащи одобрение" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3408,15 +3438,15 @@ msgstr "" msgid "Reports published" msgstr "Публикувани сигнали" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3424,11 +3454,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3468,20 +3498,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Правилното място ли е това?" @@ -3493,15 +3523,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Завъртане наляво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3512,23 +3542,23 @@ msgstr "Завъртане надясно" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Запази промените" @@ -3537,12 +3567,12 @@ msgstr "Запази промените" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3552,7 +3582,8 @@ msgstr "" msgid "Search Reports" msgstr "Търсене на Сигнали" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Търсене на Потребители" @@ -3561,7 +3592,7 @@ msgid "Search reports" msgstr "Търсене на сигнали" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Търсене:" @@ -3571,7 +3602,7 @@ msgstr "Търсене:" msgid "Searching found no reports." msgstr "Не са намерени сигнали." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Не са намерени потребители." @@ -3587,17 +3618,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Изберете район" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Изберете територия" @@ -3617,15 +3649,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3634,7 +3666,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3661,7 +3693,7 @@ msgstr "Услуга:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3670,9 +3702,9 @@ msgid "Share" msgstr "Сподели" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3680,15 +3712,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3700,7 +3732,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Показвай името ми публично" @@ -3712,21 +3744,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Покажи кабърчетата" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3769,8 +3801,8 @@ msgstr "Изход" msgid "Some categories may require additional information." msgstr "Някои категории може да се нуждаят от допълнителна информация." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3785,6 +3817,14 @@ msgstr "Някои снимки от сигнали подадени наско msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3802,7 +3842,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3824,7 +3864,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3834,15 +3874,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3850,31 +3890,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3887,14 +3928,14 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3910,7 +3951,7 @@ msgid "Status" msgstr "Статус" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3923,7 +3964,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3931,12 +3972,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Тема" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Тема:" @@ -3954,7 +3995,7 @@ msgstr "Изпращане" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3975,7 +4016,8 @@ msgstr "Сигналът е потвърден" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Абониране" @@ -3983,21 +4025,29 @@ msgstr "Абониране" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4017,11 +4067,11 @@ msgstr "Обобщена справка" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4039,8 +4089,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4050,7 +4100,7 @@ msgstr "" msgid "Text" msgstr "Текст" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Версия само с текст" @@ -4094,7 +4144,7 @@ msgstr "Благодаря! Радваме се, че този проблем е msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Прикачването на изображение е неуспешно (%s). Моля опитайте отново." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "В момента за това местоположение не може да се подаде сигнал; може би все още нямаме потвърждение от общината. Моля опитайте отново по-късно." @@ -4108,11 +4158,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Моля да ни извините, този пощенски код не беше разпознат." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Сигналът ще бъде препратен." @@ -4124,53 +4174,53 @@ msgstr "Сигналът не може да бъде разгледан %s." msgid "That report has been removed from FixMyStreet." msgstr "Този сигнал е бил изтрит от ПоправиСофия." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4180,8 +4230,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4196,12 +4246,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Бихте могли да помогнете на Общината давайки възможно най-пълната информация, с която разполагате. Моля опишете точното местонахождение на проблема, от какво естество е, от колко време съществува, кратко описание. По възможност прикачете и снимка на проблема, ако разполагате с такава." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Грешката беше: %s" @@ -4247,7 +4297,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4268,20 +4318,20 @@ msgstr "Търсеният адрес '%s' не беше намерен на т msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4295,7 +4345,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4303,8 +4357,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Възникна проблем при визуализирането на страницата с всички сигнали. Моля опитайте по-късно." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Възникна проблем при визуализирането на страницата. Моля пробвайте по-късно." @@ -4326,7 +4380,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Възникна проблем с вашата актуализация. Моля опитайте отново." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Възникна проблем с вашая сигнал. Моля опитайте отново." @@ -4343,8 +4397,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4353,7 +4407,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4371,36 +4425,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Този имейл е изпратен към двете общини покриващи адреса на сигнала, тъй като потребителя не е го е категоризирал. Моля не го взимайте под внимание ако не сте правилната община, която е отговорна за този сигнал или ни съобщете под каква категория попада този сигнал, така че да може да я добавим в системата." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Този имейл е изпратен до няколко общини покриващи адреса на сигнала, тъй като категорията на сигнала съвпада с всички тях. Моля не го взимайте под внимание ако не сте правилната община задължена за този тип проблеми." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Тази информация е необходима" @@ -4417,7 +4470,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4433,12 +4490,16 @@ msgstr "Този проблем не е решен." msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4459,7 +4520,7 @@ msgstr "Този сигнал е означен със статус отворе msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Тази страница съдържа и снимка, изпратена от нашия потребител." @@ -4470,7 +4531,7 @@ msgstr "Тази страница съдържа и снимка, изпрате msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Времева линия" @@ -4508,7 +4569,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "За да видите точното местоположение на проблема върху картата" @@ -4537,34 +4598,34 @@ msgstr "" msgid "Total" msgstr "Общо" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Опитайте отново" @@ -4583,16 +4644,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4610,7 +4671,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Непозната грешка" @@ -4623,7 +4684,7 @@ msgstr "Непозната грешка" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4636,7 +4697,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Актуализация" @@ -4645,16 +4706,16 @@ msgstr "Актуализация" msgid "Update %s created for problem %d; by %s" msgstr "Актуализиране на %s съществуващ сигнал %d; от %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Актуализирано анонимно на %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Актуализирано от %s на %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4679,7 +4740,7 @@ msgstr "" msgid "Update reopened problem" msgstr "Актуализация на възобновен сигнал" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Актуализация на статусите" @@ -4697,14 +4758,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Актуализирано!" @@ -4729,12 +4790,12 @@ msgstr "Актуализиране на {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4744,15 +4805,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4761,48 +4822,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4811,20 +4872,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Потребители" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Актуализиране на стойностите" @@ -4858,12 +4919,12 @@ msgstr "Разглеждане на сигналите по квартали" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Преглед на местоположение" @@ -4898,7 +4959,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4913,8 +4974,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Личните Ви данни ще бъдат използвани единствено и само в съответствие с нашата Политика за поверителност." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4928,8 +4989,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Редактирано на:" @@ -4949,14 +5014,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4977,15 +5038,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Бихте ли искали да получите още една анкета след 4 седмици, за да ви напомни да проверите статуса?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Моля пишете на кирилица! Писането само с главни букви и без препинателни знаци, прави съобщението трудно за разчитане." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4994,20 +5059,19 @@ msgstr "Моля пишете на кирилица! Писането само #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Да" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5015,7 +5079,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5028,7 +5092,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Можете да разгледате сигнала на този сайт." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5036,7 +5100,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "За техническа поддръжка моля пишете ни на %s" @@ -5054,15 +5118,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Можете да ни помогнете да намерим имейл адреса на който да бъдат сигнализирани проблемите в %s, като ни го изпратите на адрес %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Можете да маркирате района или общината за изтриване, ако не желаете да бъде активна за този сайт." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Вие отказахте; моля попълнете полето по-долу." -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5128,7 +5192,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Необходимо е да добавите райони (като общини) преди да е възможно подаването на сигнали." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5153,9 +5217,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Имейл" @@ -5171,10 +5236,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Вашата информация ще бъде използва само спрямо нашата Политика за поверителност" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Име" @@ -5190,7 +5255,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5213,7 +5278,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Телефонен номер" @@ -5238,7 +5303,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5255,25 +5320,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5307,8 +5371,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "редакция на потребителя" @@ -5317,12 +5381,12 @@ msgstr "редакция на потребителя" msgid "from %s different users" msgstr "от %s различни потребители" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "Последно обновено %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "преди по-малко от минута" @@ -5333,7 +5397,7 @@ msgid "n/a" msgstr "няма информация" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5373,7 +5437,7 @@ msgstr "първоначално въведен: “%s”" msgid "other areas:" msgstr "други територии:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5381,7 +5445,7 @@ msgstr "" msgid "sign out" msgstr "излизане" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5398,19 +5462,19 @@ msgstr "мястото не е било отбелязано на картата msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "този тип сигнали" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "днес" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5426,11 +5490,11 @@ msgstr "потребителят е от същата община като пр msgid "user is problem owner" msgstr "потребителят е собственик на сигнала" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5439,35 +5503,35 @@ msgstr "" msgid "ward" msgstr "квартал" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d ден" msgstr[1] "%d дни" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d час" msgstr[1] "%d часа" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d минута" msgstr[1] "%d минути" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5481,14 +5545,14 @@ msgid_plural "%d supporters" msgstr[0] "%d поддръжник" msgstr[1] "%d поддръжници" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d седмица" msgstr[1] "%d седмици" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5558,7 +5622,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%sактуализиран сигнал" msgstr[1] "%sактуализирани сигнала" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5579,7 +5643,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Все още нямаме информация за общината, която стопанисва тази територия." msgstr[1] "Все още нямаме информация за общините, които стопанисват тази територия." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po index f403250d42d..6786177a46c 100644 --- a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/mysociety/teams/12067/ca_ES/)\n" "Language: ca_ES\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "i" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "i" msgid " or " msgstr "o" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d modificacions per %s" @@ -48,7 +48,7 @@ msgstr "%d modificacions per %s" msgid "%d to %d of %d" msgstr "%d a %d de %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "" @@ -163,11 +163,11 @@ msgstr "" msgid "(optional)" msgstr "(opcional)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(enviat als dos)" @@ -176,13 +176,13 @@ msgstr "(enviat als dos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Tria una categoria --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "--Escull una plantilla--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%s desat." @@ -232,11 +232,11 @@ msgstr "" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Afegeix un contacte utilitzant el formulari següent." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Afegeix el cos" @@ -291,8 +291,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Afegeix una nova categoria" @@ -307,27 +307,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Afegeix un usuari" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Afegeix/edita categories de problemes" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Afegeix/edita prioritats de resposta" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Afegeix/edita plantilles de resposta" @@ -335,7 +335,7 @@ msgstr "Afegeix/edita plantilles de resposta" msgid "Added %s" msgstr "Afegit %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "Avisa'm de futures actualitzacions" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "Tots els informes entre %s i %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anònim" @@ -445,29 +448,29 @@ msgstr "Anònim" msgid "Another user" msgstr "Un altre usuari" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Estàs segur de voler cancel·lar aquesta càrrega?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Estàs segur?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Àrea coberta" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Àrea:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -488,11 +491,11 @@ msgstr "Assigna a un cos extern:" msgid "Assign to subdivision:" msgstr "Assigna a subdivisió:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "Assigna usuaris a àreas" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Assignat a %s" @@ -504,8 +507,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "Resposta automática:" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Esperant moderació" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Torna" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Torna a tots els informes" @@ -554,10 +557,10 @@ msgstr "Torna a tots els informes" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "Cossos" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Cos" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Cos:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -592,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "No pots veure el mapa? Salta aquest pas" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "Categories" msgid "Categories:" msgstr "Categories:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "Categoria" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categoria canviada de ‘%s’ a ‘%s’" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "Canvia la contrasenya" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -678,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "Escull un altre" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "Neteja les dades fora de línia" @@ -720,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,17 +773,17 @@ msgstr "" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuració" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Confirma" @@ -797,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "Confirmació" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Confirmat" @@ -829,7 +836,11 @@ msgstr "Contacta a l'equip" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -838,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "" @@ -851,9 +862,11 @@ msgstr "" msgid "Council" msgstr "" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "" @@ -882,8 +895,8 @@ msgstr "Crea un informe" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Crea una categoria" @@ -891,15 +904,15 @@ msgstr "Crea una categoria" msgid "Create priority" msgstr "Crea una prioritat" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +926,7 @@ msgstr "Crea una plantilla" msgid "Created" msgstr "Creat" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -936,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -969,32 +982,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Elimina plantilla" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Eliminat" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1010,18 +1023,18 @@ msgstr "Descripció" msgid "Description:" msgstr "Descripció:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detalls" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1032,7 +1045,7 @@ msgstr "Detalls:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -1041,24 +1054,24 @@ msgstr "" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1067,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "Tens contrasenya de %s?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "No t'agraden els formularis?" @@ -1083,19 +1096,19 @@ msgstr "No t'agraden els formularis?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "Duplicat de" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "Duplicats" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1103,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1112,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Edita" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Edita els detalls del cos" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Edita la categoria d'informes" @@ -1136,15 +1149,15 @@ msgstr "Edita la categoria d'informes" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Edita la prioritat d'informes" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Edita els informes" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1167,28 +1180,28 @@ msgstr "Editant el problema %d" msgid "Editing update %d" msgstr "Editant l'actualització %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Editant l'usuari %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Editor" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Correu electrònic" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1217,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Correu electrònic:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1255,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1264,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1281,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1303,10 +1316,6 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Entra els detalls del problema" @@ -1320,13 +1329,13 @@ msgstr "Entra els detalls del problema" msgid "Error" msgstr "Error" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Tot" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "" @@ -1338,11 +1347,11 @@ msgstr "Exemples:" msgid "Existing category" msgstr "Categoria existent" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1359,7 +1368,7 @@ msgstr "Exporta com a CSV" msgid "External ID" msgstr "ID extern" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "URL externa" @@ -1380,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "Equip extern" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Data extra:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Detalls extres" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1421,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1445,9 +1455,9 @@ msgstr "" msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Marca com esborrat" @@ -1455,8 +1465,8 @@ msgstr "Marca com esborrat" msgid "Flag user" msgstr "Marca l'usuari" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Marcat" @@ -1464,7 +1474,7 @@ msgstr "Marcat" msgid "Flagged reports and users" msgstr "Informes i usuaris marcats" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1473,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Marcat:" @@ -1489,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1503,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Has oblidat la teva contrasenya?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1523,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Obté actualitzacions" @@ -1553,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1565,7 +1577,7 @@ msgstr "Ves" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1624,11 +1636,11 @@ msgstr "Ocultat" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "Oculta l'informe complet" @@ -1649,9 +1661,9 @@ msgstr "Oculta el meu nom en aquesta actualització" msgid "Hide my name on this report" msgstr "Oculta el meu nom en aquest informe" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "" @@ -1668,11 +1680,11 @@ msgstr "Oculta el teu nom?" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Inici" @@ -1680,7 +1692,7 @@ msgstr "Inici" msgid "How to report a problem" msgstr "Com informar un problema" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Com enviar informes satisfactoris" @@ -1702,7 +1714,7 @@ msgstr "" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1711,8 +1723,8 @@ msgstr "" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1734,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1752,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1779,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID il·legal" @@ -1814,7 +1830,7 @@ msgstr "ID il·legal" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1826,7 +1842,7 @@ msgstr "En taula d'abús?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "Inactiu" @@ -1842,15 +1858,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1858,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "Notes internes" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1866,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1892,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1905,8 +1921,8 @@ msgstr "" msgid "Last 7 days" msgstr "Últims 7 dies" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Últim editor" @@ -1922,17 +1938,17 @@ msgstr "Última actualització:" msgid "Last update:" msgstr "Última actualització:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "Latitut/Longitut:" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1940,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Llista tots els problemes informats" @@ -1984,16 +2000,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2001,23 +2017,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Mapa" @@ -2025,15 +2041,15 @@ msgstr "Mapa" msgid "Mark as sent" msgstr "Marca com enviat" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Missatge" @@ -2049,19 +2065,19 @@ msgstr "Missatge al cos extern:" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Modera" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "Modera detalls de l'informe" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Modera aquest informe" @@ -2069,10 +2085,10 @@ msgstr "Modera aquest informe" msgid "Moderate this update" msgstr "Modera aquesta actualització" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "Moderat per %s a %s" @@ -2090,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "Mes" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Més comentat" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2107,11 +2123,11 @@ msgstr "Més comentat" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2120,7 +2136,7 @@ msgstr "Nom" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Nom:" @@ -2130,11 +2146,11 @@ msgstr "Nom:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Navega a aquest problema" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2146,7 +2162,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2170,11 +2186,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Nou cos afegit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Nova categoria de contacte afegida" @@ -2210,23 +2226,23 @@ msgstr "" msgid "New priority" msgstr "Nova prioritat" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2234,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2270,11 +2286,11 @@ msgstr "" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "El més nou" @@ -2286,10 +2302,10 @@ msgstr "Següent" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2297,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "No" @@ -2309,11 +2324,7 @@ msgstr "No" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Sense àrea" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Sense cos" @@ -2321,7 +2332,7 @@ msgstr "Sense cos" msgid "No council selected" msgstr "" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "" @@ -2338,11 +2349,11 @@ msgstr "No s'han trobat usuaris marcats." msgid "No further updates" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2350,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "No s'han retornat resultats" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2372,15 +2383,15 @@ msgstr "Sense seguidors" msgid "None" msgstr "Cap" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2400,13 +2411,13 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "" @@ -2430,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2446,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2466,7 +2477,7 @@ msgstr "" msgid "Open" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2474,7 +2485,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2506,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "" @@ -2541,8 +2552,8 @@ msgstr "" msgid "Page Not Found" msgstr "" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "" @@ -2556,19 +2567,19 @@ msgstr "" msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2588,17 +2599,16 @@ msgstr "" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2609,6 +2619,7 @@ msgstr "" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2623,7 +2634,7 @@ msgstr "" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2652,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" @@ -2673,7 +2688,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,11 +2696,11 @@ msgstr "" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "" @@ -2694,8 +2709,9 @@ msgstr "" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2711,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,90 +2741,90 @@ msgstr "" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "" @@ -2836,7 +2852,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2862,11 +2878,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2902,16 +2918,16 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "" @@ -2947,12 +2963,12 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2966,14 +2982,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2996,7 +3016,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "" @@ -3004,7 +3024,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -3029,7 +3049,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3054,8 +3074,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" @@ -3081,7 +3101,7 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3106,6 +3126,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -3129,11 +3150,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -3141,7 +3162,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3161,6 +3182,14 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3180,11 +3209,11 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3196,7 +3225,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3210,9 +3239,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3238,20 +3267,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3261,7 +3290,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3295,17 +3324,18 @@ msgid "Report, view, or discuss local problems" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -3349,28 +3379,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3382,7 +3412,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3394,15 +3424,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3410,11 +3440,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3454,20 +3484,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3479,15 +3509,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3498,23 +3528,23 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -3523,12 +3553,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3538,7 +3568,8 @@ msgstr "" msgid "Search Reports" msgstr "" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "" @@ -3547,7 +3578,7 @@ msgid "Search reports" msgstr "" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" @@ -3557,7 +3588,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3573,17 +3604,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "" @@ -3603,15 +3635,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3620,7 +3652,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3647,7 +3679,7 @@ msgstr "" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3656,9 +3688,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3666,15 +3698,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3686,7 +3718,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "" @@ -3698,21 +3730,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3755,8 +3787,8 @@ msgstr "" msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3771,6 +3803,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3788,7 +3828,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3810,7 +3850,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3820,15 +3860,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3836,31 +3876,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3873,14 +3914,14 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3896,7 +3937,7 @@ msgid "Status" msgstr "" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3909,7 +3950,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3917,12 +3958,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" @@ -3940,7 +3981,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3961,7 +4002,8 @@ msgstr "" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -3969,21 +4011,29 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4003,11 +4053,11 @@ msgstr "" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4025,8 +4075,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4036,7 +4086,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "" @@ -4080,7 +4130,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4094,11 +4144,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "" @@ -4110,53 +4160,53 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4166,8 +4216,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4182,12 +4232,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "" @@ -4233,7 +4283,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4254,20 +4304,20 @@ msgstr "" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4279,7 +4329,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4287,8 +4341,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4310,7 +4364,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -4327,8 +4381,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4337,7 +4391,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4355,36 +4409,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4401,7 +4454,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4417,12 +4474,16 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4443,7 +4504,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4454,7 +4515,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4492,7 +4553,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4521,34 +4582,34 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "" @@ -4567,16 +4628,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4594,7 +4655,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "" @@ -4607,7 +4668,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4620,7 +4681,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4629,16 +4690,16 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4663,7 +4724,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4681,14 +4742,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "" @@ -4713,12 +4774,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4728,15 +4789,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4745,48 +4806,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4795,20 +4856,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4842,12 +4903,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4882,7 +4943,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4897,7 +4958,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4912,8 +4973,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "" @@ -4933,14 +4998,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4961,15 +5022,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4978,20 +5043,19 @@ msgstr "" #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -4999,7 +5063,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5012,7 +5076,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5020,7 +5084,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5038,15 +5102,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5112,7 +5176,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5134,9 +5198,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5152,10 +5217,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "" @@ -5171,7 +5236,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5194,7 +5259,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "" @@ -5219,7 +5284,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5236,25 +5301,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5288,8 +5352,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5298,12 +5362,12 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "" @@ -5314,7 +5378,7 @@ msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5354,7 +5418,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5362,7 +5426,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5379,19 +5443,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "avui" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5407,11 +5471,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5420,35 +5484,35 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dies" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5462,14 +5526,14 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d setmana" msgstr[1] "%d setmanes" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5539,7 +5603,7 @@ msgid_plural "%s updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5560,7 +5624,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po index a41730fc97f..342511b2dc1 100644 --- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/mysociety/teams/12067/cs_CZ/)\n" "Language: cs_CZ\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr " a " -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr " a " msgid " or " msgstr " nebo " -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d úprav od %s" @@ -48,7 +48,7 @@ msgstr "%d úprav od %s" msgid "%d to %d of %d" msgstr "%d až %d z %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(např. graffiti, rozbité pouliční osvětlení, díry v komunikacích msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(není odesláno na úřad)" @@ -163,11 +163,11 @@ msgstr "(není odesláno na úřad)" msgid "(optional)" msgstr "(volitelně)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(odesláno dvoum??)" @@ -176,13 +176,13 @@ msgstr "(odesláno dvoum??)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Vyberte kategorii --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -206,11 +206,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -235,11 +235,11 @@ msgstr "Ne Potvrdím aktualizaci e-mailem" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -259,8 +259,8 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -270,13 +270,13 @@ msgstr "" " kterému bude hlášení zasláno. Každé instituci můžete zadat jeden nebo více kontaktů (pro různé\n" " kategorie hlášení)." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Přidejte kontakt pomocí formuláře níže." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Zadejte instituci" @@ -297,8 +297,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Přidat novou kategorii" @@ -313,27 +313,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Přidat Uživatele" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -341,7 +341,7 @@ msgstr "" msgid "Added %s" msgstr "Přidáno %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -370,7 +370,6 @@ msgstr "Upozorněte mě na budoucí aktualizace" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -417,11 +416,15 @@ msgstr "Všechna hlášení od %s do %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -440,9 +443,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonymní:" @@ -451,29 +454,29 @@ msgstr "Anonymní:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Oblast pokrytí" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Vzhledem k tomu, že je ve stavu 'staging site' a %s je 'nepravda', budou reporty vypracované na těchto stránkách zaslány uživateli, který nahlásil problém a ne kontaktu uvedenému v nastavení dané oblasti a kategorie." @@ -494,11 +497,11 @@ msgstr "Přiřaďte externí instituci:" msgid "Assign to subdivision:" msgstr "Přiřaďte oddělení:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Přířazeno: %s" @@ -510,8 +513,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "V současné době funguje pouze vyhledávání a prohlížení nahlášených problémů." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -527,7 +530,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -548,11 +551,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Čeká se na moderování" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Zpět" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -560,10 +563,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -572,17 +575,17 @@ msgstr "Subjekty" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Subjekt" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Subjekt:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -598,7 +601,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Nevidíte mapu? vynechte tento krok" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -609,15 +612,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -630,7 +633,7 @@ msgstr "Katetorie" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -640,9 +643,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Category fix rate for problems > 4 týdny staré" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -669,11 +672,11 @@ msgstr "Změnit heslo" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -690,7 +693,7 @@ msgstr "" " Toto nastavení je vhodné pro hlášení , která chcete umožnit uživatelům úřadům nahlásit, ale pro které neexistuje žádný veřejný \n" " zájem na veřejné zobrazení zpráv. Může to být například interní žádost o umístění nových odpadkových košů na specifickou adresu a pod." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -698,11 +701,11 @@ msgstr "" "Jméno kategorie zvolte tak, aby dávalo smysl pro veřejnost (např, \"Díra v silnici \", \"Pouliční osvětlení \"), ale je užitečné \n" " i pro daný úřad. Názvy kategorií se objeví v rozbalovací nabídce na stránce Nahlásit problém." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -734,9 +737,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -780,17 +787,17 @@ msgstr "Motiv:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Nastavení" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Potvrdit" @@ -811,9 +818,9 @@ msgstr "" msgid "Confirmation" msgstr "Potvrzení" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Potvrzeno" @@ -843,7 +850,11 @@ msgstr "Kontaktujte nás!" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -852,12 +863,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Uživatele nelze najít" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Lokalitu nelze vyhledat" @@ -865,9 +876,11 @@ msgstr "Lokalitu nelze vyhledat" msgid "Council" msgstr "Úřad" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Kontakty na úřad %s" @@ -896,8 +909,8 @@ msgstr "Vytvořit report" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Vytvořit kategorii" @@ -905,15 +918,15 @@ msgstr "Vytvořit kategorii" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -927,7 +940,7 @@ msgstr "" msgid "Created" msgstr "Vytvořeno" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -950,12 +963,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Doposud nebyl vytvořen žádný subjekt." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -983,32 +996,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Smazána" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1024,18 +1037,18 @@ msgstr "Popis" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Podrobnosti" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1046,7 +1059,7 @@ msgstr "Podrobnosti:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Předáno" @@ -1055,24 +1068,24 @@ msgstr "Předáno" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Tabulka Vížěhů" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1081,7 +1094,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1089,7 +1102,7 @@ msgstr "" msgid "Don’t know" msgstr "Není známo" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Nechcete řešit formulářem?" @@ -1097,19 +1110,19 @@ msgstr "Nechcete řešit formulářem?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1117,8 +1130,8 @@ msgid "" " " msgstr "Každému kontaktu daného subjektu můžeme přidělit kategorii, která je zobrazena veřejně. Různé kategorie mohou mít společný kontakt (e-mail). To znamená, že můžete přidat mnoho kategorií, i když máte jen jednu kontaktní osobu pro daný subjekt." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1126,23 +1139,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Upravit" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Editace podrobností subjektu" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1150,15 +1163,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1181,28 +1194,28 @@ msgstr "Úpravy hlášení %d" msgid "Editing update %d" msgstr "Úpravy aktualizace %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Aktualizace uživatele %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Úprava" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-Mail" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1231,37 +1244,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "E-mail:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1269,8 +1282,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1278,16 +1291,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1295,7 +1308,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Endpoint" @@ -1317,10 +1330,6 @@ msgstr "Zadejte blízké poštovní směrovací číslo nebo název ulice či o msgid "Enter a nearby street name and area" msgstr "Zadejte PSČ, název ulice nebo název oblasti" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Uveďte podrobnosti daného problému" @@ -1334,13 +1343,13 @@ msgstr "Uveďte podrobnosti daného problému" msgid "Error" msgstr "Chyba" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Příklad PSČ %s" @@ -1352,11 +1361,11 @@ msgstr "Příklady:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1373,7 +1382,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1394,25 +1403,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Doplňující data:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1435,11 +1444,12 @@ msgstr "" msgid "Filter report list" msgstr "Filtrovat seznam hlášení" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Poprvé" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Pro opravu vyberte oblast pokrytí v části Editace podrobností subjektu ve formuláři níže." @@ -1459,9 +1469,9 @@ msgstr "vyřešené - Úřad" msgid "Fixed - User" msgstr "Vyřešené - Uživatel" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Označené za smazané" @@ -1469,8 +1479,8 @@ msgstr "Označené za smazané" msgid "Flag user" msgstr "Sledovat uživatele" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Určeno ke sledování" @@ -1478,7 +1488,7 @@ msgstr "Určeno ke sledování" msgid "Flagged reports and users" msgstr "Sledovaná hlášení a sledovaní uživatelé" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Takto označení uživatelé jsou v seznamu na této stránce." @@ -1487,7 +1497,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Označení uživatelé nejsou žádným způsobem omezováni. Je to jen seznam uživatelů, kteří byli označeni k Vaší pozornosti." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Sledováno:" @@ -1503,7 +1513,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Více informací naleznete v článku Jak FixMyStreet používá Mapit." @@ -1517,11 +1527,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Zapomněli jste své heslo?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1537,6 +1547,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Zasílání aktualizací" @@ -1567,9 +1579,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1579,7 +1591,7 @@ msgstr "OK" msgid "Going to send questionnaire?" msgstr "Odeslat dotazník?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1587,7 +1599,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Graf hlášení v čase a jejich stavů" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1638,11 +1650,11 @@ msgstr "Skrytý" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1663,9 +1675,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Schovat značky" @@ -1682,11 +1694,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Historie" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Úvodní stránka" @@ -1694,7 +1706,7 @@ msgstr "Úvodní stránka" msgid "How to report a problem" msgstr "Jak nahlásit problém" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Anleitung" @@ -1716,7 +1728,7 @@ msgstr "Bohužel, nelze lokalizovat Vaše hlášení v databázi.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1725,8 +1737,8 @@ msgstr "Bohužel, nelze lokalizovat Vaše hlášení v databázi.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1750,7 +1762,7 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1758,7 +1770,7 @@ msgstr "" "Pokud dva nebo více subjektů působí ve stejné lokalitě, FixMyStreet spojuje identické kategorie do jedné\n" " položky menu. Pokud to tak chcete, ujistěte se, že jména kategorie v těchto subjektech jsou totožná." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1770,6 +1782,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1797,34 +1813,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Pokud používáte metodu zasílání mimo zaslání emailu, zadejte zde ID služby (Open311) nebo její ekvivalent." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Neplatné ID" @@ -1832,7 +1848,7 @@ msgstr "Neplatné ID" msgid "Illegal feed selection" msgstr "Neplatný výběr zdoje" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1844,7 +1860,7 @@ msgstr "V tabulce zneužívání?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Kromě toho, tyto atributy, které nejsou součástí specifikace Open311 v2 jsou vráceny: agency_sent_datetime název (také vrácený jako součást popisu), interface_used, comment_count, requestor_name (přítomný pouze tehdy, pokud žadatel povolen název, který bude zobrazen na této stránce) ," -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1860,15 +1876,15 @@ msgstr "Zahrnuty osobní údaje hlasatele problému" msgid "Incorrect has_photo value \"%s\"" msgstr "Chybná has_photo hodnota \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1876,7 +1892,7 @@ msgstr "" msgid "Internal notes" msgstr "Interní poznámky" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1884,12 +1900,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Chybná agency_responsible hodnota %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Chybný formát %s specified." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1910,7 +1926,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1923,8 +1939,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Poslední úpravy" @@ -1940,17 +1956,17 @@ msgstr "Poslední úpravy:" msgid "Last update:" msgstr "Poslední úpravy:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Ponechte prázdné, pokud pro tento subjekt bude vždy použitá stejná metoda zasílání (např. \"%s\")." @@ -1958,7 +1974,7 @@ msgstr "Ponechte prázdné, pokud pro tento subjekt bude vždy použitá stejná msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Seznam všech hlášení" @@ -2002,16 +2018,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2019,23 +2035,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "MAPA" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Mapa" @@ -2043,15 +2059,15 @@ msgstr "Mapa" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Označte uživatele, jejichž chování chcete sledovat a označte je příznakem." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Zpráva" @@ -2067,19 +2083,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Chybějící jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2087,10 +2103,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2108,12 +2124,12 @@ msgstr "" msgid "Month" msgstr "Měsíc" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2125,11 +2141,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2138,7 +2154,7 @@ msgstr "Jméno" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Jméno:" @@ -2148,11 +2164,11 @@ msgstr "Jméno:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2164,7 +2180,7 @@ msgstr "Nejbližší pojmenovaná ulice k umístěné značce na mapě (automati msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Nejbližší PSČ k umístěné značce na mapě (automaticky generováno) %s (%sm away)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Nejbližší cesta k umístěné značce na mapě (automaticky generováno pomocí Bing Mapy): %s" @@ -2190,11 +2206,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Přidán nový subjekt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Do kategorie byl přidán nový kontakt" @@ -2230,23 +2246,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2254,7 +2270,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Nová hlášení pro {{COUNCIL}} , oblast {{WARD}} na FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2290,11 +2306,11 @@ msgstr "Nový stav" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2306,10 +2322,10 @@ msgstr "Další" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2317,11 +2333,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Ne" @@ -2329,11 +2344,7 @@ msgstr "Ne" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Žádný subjekt" @@ -2341,7 +2352,7 @@ msgstr "Žádný subjekt" msgid "No council selected" msgstr "Není vybrán žádný úřad" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Nebyly provedeny žádné úpravy." @@ -2358,11 +2369,11 @@ msgstr "Nebyli nalezeni žádní sledovaní uživatelé." msgid "No further updates" msgstr "Žádné další aktualizace" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2370,12 +2381,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Vráceno bez výsledku." -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2394,15 +2405,15 @@ msgstr "Žádný podporovatel." msgid "None" msgstr "Žádné" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2426,13 +2437,13 @@ msgstr "Hlásil(a) jsem poprvé" msgid "Not reported to council" msgstr "Na úřad nebylo hlášeno" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Poznámka" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Poznámka:" @@ -2456,15 +2467,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2472,16 +2483,16 @@ msgstr "" msgid "Old state" msgstr "Starý stav" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2492,7 +2503,7 @@ msgstr "" msgid "Open" msgstr "Otevřený" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2500,7 +2511,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API pro server mySociety FixMyStreet" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2532,17 +2543,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Ostatní" @@ -2567,8 +2578,8 @@ msgstr "Vlastník" msgid "Page Not Found" msgstr "Stránka nenalezena" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Nadřazený subjekt" @@ -2582,19 +2593,19 @@ msgstr "Částečně" msgid "Password (optional)" msgstr "Heslo (volitelně)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Trvalý odkaz" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2614,17 +2625,16 @@ msgstr "Telefonní číslo (volitelně)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefon:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2635,6 +2645,7 @@ msgstr "Telefon:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2649,7 +2660,7 @@ msgstr "Fotografie" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2678,11 +2689,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Umísti špendlík na mapu" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Buďte prosím zdvořilí, struční a vyjadřujte se k věci." @@ -2699,7 +2714,7 @@ msgstr "Zkontrolujte prosím hesla a zkuste znovu" msgid "Please check your email address is correct" msgstr "Zkontrolujte, zda je vaše emailová adresa správná" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2707,11 +2722,11 @@ msgstr "Zkontrolujte, zda je vaše emailová adresa správná" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Vyberte kategorii" @@ -2720,8 +2735,9 @@ msgstr "Vyberte kategorii" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Opravte prosím chyby uvedené níže" @@ -2737,13 +2753,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Nezneužívejte tento nástroj - zneužívání vašeho úřadu znehodnocuje službu pro všechny uživatele." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "prosím zadejte zprávu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2751,90 +2767,90 @@ msgstr "prosím zadejte zprávu" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Prosím zadejte heslo" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Prosím zadejte název" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Prosím zadejte platný e-mail" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Prosím zadejte platnou emailovou adresu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Prosím zadejte podrobnosti" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Prosím zadejte váš e-mail" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Zadejte vaše jméno" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Zadejte své celé jméno, úřad potřebuje tyto informace - jestliže si přejete, aby Vaše jméno nebylo na webu zobrazeno, odškrtněnte čvereček níže" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Zadejte vaše jméno" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Prosím zadejte vaše telefonní číslo" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Prosím zadejte vaše příjmení" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Zadejte nadpis" @@ -2862,7 +2878,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Uveďte, zda chcete dostat další dotazník" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2888,11 +2904,11 @@ msgstr "" msgid "Please note:" msgstr "Vezměte prosím na vědomí:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2928,16 +2944,16 @@ msgstr "Uveďte, prosím, zda byl či nebyl problém vyřešen" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Napište zprávu" @@ -2973,12 +2989,12 @@ msgstr "" msgid "Previous" msgstr "Předcházející" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2992,14 +3008,18 @@ msgstr "Ochrana osobních údajů" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Neveřejné" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Hlášení" @@ -3022,7 +3042,7 @@ msgstr "Hlášení %s bylo odesláno na úřad %s" msgid "Problem breakdown by state" msgstr "Členění hlášení podle stavu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Hlášení bylo označeno za otevřené." @@ -3030,7 +3050,7 @@ msgstr "Hlášení bylo označeno za otevřené." msgid "Problem state change based on survey results" msgstr "Stav hlášení byl změněn na základě výsledků šetření" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Hlášení" @@ -3055,7 +3075,7 @@ msgstr "Hlášení označená za vyřešená na serveru FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3080,8 +3100,8 @@ msgstr "" msgid "Property address:" msgstr "Adresa nemovitosti:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Poskytněte aktuální informace" @@ -3107,7 +3127,7 @@ msgstr "" msgid "Public response:" msgstr "Veřejná reakce:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3132,6 +3152,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Dotazník %d poslal k hlášení %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Dotazník vyplňuje uživatel, který podal hlášení problému" @@ -3155,11 +3176,11 @@ msgstr "RSS kanál pro oblast %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "RSS kanál pro %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "RSS kanál pro %s, v oblasti %s " @@ -3167,7 +3188,7 @@ msgstr "RSS kanál pro %s, v oblasti %s " msgid "RSS feed of nearby problems" msgstr "RSS kanál hlášení v okolí" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3187,6 +3208,14 @@ msgstr "RSS kanál aktuálních lokálních hlášení" msgid "RSS feed of updates to this problem" msgstr "RSS kanál aktualizací tohoto hlášení" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3206,11 +3235,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Nedávno nahlášené problémy" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3222,7 +3251,7 @@ msgstr "Uvědomte si, že FixMyStreet je především pro hlášení fyzických msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3236,9 +3265,9 @@ msgstr "Odstranit příznak" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3264,20 +3293,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Nahlásit problém" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3287,7 +3316,7 @@ msgstr "" msgid "Report abuse" msgstr "Nevhodný obsah" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3321,17 +3350,18 @@ msgid "Report, view, or discuss local problems" msgstr "Hlášení, zobrazení a diskuse nad lokálními problémy" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Nahlášeno anonymně v %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Hlásil(a) jsem již dříve" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Nahlášeno uživatelem %s, určeno pro %s" @@ -3375,28 +3405,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Hlášení problému" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Hlášení" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Délka hlášení je omezena na %s znaků. Prosím, zkraťte své hlášení" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3408,7 +3438,7 @@ msgstr "Hlášení čekající na schválení" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3420,15 +3450,15 @@ msgstr "" msgid "Reports published" msgstr "Publikovaná hlášení" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3436,11 +3466,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3480,20 +3510,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Správné místo?" @@ -3505,15 +3535,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Otočit doleva" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3524,23 +3554,23 @@ msgstr "Otočit doprava" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelitní" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Uložit změny" @@ -3549,12 +3579,12 @@ msgstr "Uložit změny" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3564,7 +3594,8 @@ msgstr "" msgid "Search Reports" msgstr "Vyhledat hlášení" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Vyhledat uživatele" @@ -3573,7 +3604,7 @@ msgid "Search reports" msgstr "Vyhledat hlášení" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Vyhledat:" @@ -3583,7 +3614,7 @@ msgstr "Vyhledat:" msgid "Searching found no reports." msgstr "Nebylo nalezeno žádné hlášení." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Nebyli nalezeni žádní sledovaní uživatelé." @@ -3599,17 +3630,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Zvolte subjekt" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Zvolte oblast" @@ -3629,15 +3661,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3646,7 +3678,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3673,7 +3705,7 @@ msgstr "Služba:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3682,9 +3714,9 @@ msgid "Share" msgstr "Sdílet" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3692,15 +3724,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3712,7 +3744,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Zobrazit moje jméno veřejně" @@ -3724,21 +3756,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Zobrazit značky" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3781,8 +3813,8 @@ msgstr "Odhlásit se" msgid "Some categories may require additional information." msgstr "Nekteré kategorie mohou vyžadovat dodatečné informace." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3797,6 +3829,14 @@ msgstr "Některé fotografie současných hlášení" msgid "Some text to localize" msgstr "Specifický název pro lokalizaci" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Je nám líto, že se zdá, že toto PSČ nepokrýváme." @@ -3814,7 +3854,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Omlouváme se, došlo k chybě potvrzující váš problém." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3836,7 +3876,7 @@ msgstr "Omlouváme se, nelze lokalizovat. Zkuste ještě jednou." msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3846,15 +3886,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3862,31 +3902,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Stav" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3899,14 +3940,14 @@ msgstr "" msgid "State:" msgstr "Stav:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3922,7 +3963,7 @@ msgid "Status" msgstr "Stav" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3935,7 +3976,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3943,12 +3984,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Oddělení/Instituce" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Předmět" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Předmět:" @@ -3966,7 +4007,7 @@ msgstr "Odeslat" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3987,7 +4028,8 @@ msgstr "Odesláno" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Přihlásit se k odběru" @@ -3995,21 +4037,29 @@ msgstr "Přihlásit se k odběru" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4029,11 +4079,11 @@ msgstr "Souhrnný přehled" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4051,8 +4101,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4062,7 +4112,7 @@ msgstr "" msgid "Text" msgstr "Text" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Pouze textová verze" @@ -4106,7 +4156,7 @@ msgstr "Díky, rádi slyšíme, že to bylo vyřešeno! Můžeme se ještě zept msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Zdá se, že se obrázek nenahrál správně (%s), zkuste to prosím znovu." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Zdá se, že tato lokalita nepatří do žádné městské části nebo obecního úřadu na území ČR. Možná se jedná o offshore nebo se nachází v zahraničí. Zkuste to prosím znovu." @@ -4120,11 +4170,11 @@ msgstr "To místo se nezdá být v České republice; prosím zkuste to znovu." msgid "That postcode was not recognised, sorry." msgstr "Omlouváme se, ale poštovní směrovací číslo nebylo rozpoznáno." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Hlášení bude nyní opět odesláno." @@ -4136,23 +4186,23 @@ msgstr "Tento report nemůže být zobrazen na %s." msgid "That report has been removed from FixMyStreet." msgstr "Toto hlášení bylo vyjmuto z FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4160,8 +4210,8 @@ msgstr "" "E-mailová adresa je cíl, kterému zprávy o této kategorii budou odeslány. \n" " Ostatní kategorie tohoto subjektu mohou mít stejnou e-mailovou adresu." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4169,24 +4219,24 @@ msgstr "" "strong>Endpoint je adresa URL služby, která FixMyStreet propojí \n" " s interním systémem daného subjektu." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4196,8 +4246,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4214,12 +4264,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Úřad nebude moci pomoci, pokud ve svém hlášení nezadáte dostatek podrobností. Popište, prosím, přesné umístění problému (například na zdi), co tam je, jak dlouho to tam bylo a td. Uveďte popis včetně fotografie problému, pokud ji máte." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Tabulka Vítězů ukazuje aktivity editorů (kdo editoval nejvíce záznamů)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Nastala chyba: %s" @@ -4265,7 +4315,7 @@ msgstr "Poslední hlášení uživatelů pro {{NAME}}" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Seznam oblastí byl povolen službou MapIt na adrese %s." @@ -4286,20 +4336,20 @@ msgstr "Požadovaná adresa URL '%s' nebyla na tomto serveru nalezena" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Uživatel nemohl lokalizovat problém v mapě, ale je zobrazeno okolí lokality při zadání hlášení" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4313,7 +4363,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4321,8 +4375,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Nastal problém v zobrazení stránky Všechna hlášení. Prosím, zkuste později." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Nastal problém v zobrazení této stránky. Prosím, zkuste později." @@ -4344,7 +4398,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Nastal problém s vaší aktualizací. Prosím opakujte ještě jednou." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Nastal problém s vaším hlášením. Prosím, přečtěte si informace níže." @@ -4361,8 +4415,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4376,7 +4430,7 @@ msgstr "" " tento článek . \n" " " -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4394,7 +4448,7 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Na implementaci API se stále pracuje a není dosud stabilní. V budoucnu se může bez upozornění změnit." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4404,12 +4458,12 @@ msgstr "" " V důsledku toho se žádná z jejích kategorií neobjeví v rozbalovacím menu kategorií, když uživatelé hlásí problémy. \n" " V současné době nemohou uživatelé tomuto subjektu reportovat žádné problémy ." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Úřad nemá nastaven žádný kontakt. To znamená, že nahlášené problémy tomuto úřadunebudou zasílány." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4417,18 +4471,17 @@ msgstr "" "Tomuto úřadu budou zasálána pouze hlášení o problémech, která jsou umístěna v oblasti pokrytí. \n" " Úřad nebude dostávat žádné zprávy, pokud nepokrývá alespoň jednu vybranou oblast." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Tento e-mail byl odeslán na oba úřady působící v dané lokalitě, protože uživatel hlášení nekategorizoval. Prosím ignorujte, pokud nejste oprávněný úřad kompetentní řešit nahlášený problém nebo nám dejte vědět, jaká je to kategorie problémů a kdo jí má na starosti, my jí doplníme do našeho systému." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Tento e-mail byl odeslán na několik úřadů působících v dané lokalitě, protože zvolená kategorie hlášení je uvedena pro všechny z nich. Prosím ignorujte, pokud nejste oprávněný úřad kompetentní řešit nahlášený problém." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Tato informace je vyžadována" @@ -4445,7 +4498,11 @@ msgstr "Toto je vývojářský web; věci mohou kdykoli přestat fungovat, data msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4461,12 +4518,16 @@ msgstr "Hlášení nemohlo být vyřešeno" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Hlášení čeká na moderování operátorem." @@ -4487,7 +4548,7 @@ msgstr "Hlášení je aktuálně označené za otevřené." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Webová stránka také obsahuje fotografii hlášení, poskytnutou uživatelem." @@ -4498,7 +4559,7 @@ msgstr "Webová stránka také obsahuje fotografii hlášení, poskytnutou uživ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Časová osa" @@ -4536,7 +4597,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Pro zobrazení mapy přesného umístění tohoto problému" @@ -4565,34 +4626,34 @@ msgstr "" msgid "Total" msgstr "Celkem" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Opakujte znovu" @@ -4611,16 +4672,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4638,7 +4699,7 @@ msgstr "Neznámý typ upozornění" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Neznámá chyba" @@ -4651,7 +4712,7 @@ msgstr "Neznámá chyba" msgid "Unknown problem ID" msgstr "Neznámé ID hlášení" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4664,7 +4725,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Aktualizovat" @@ -4673,16 +4734,16 @@ msgstr "Aktualizovat" msgid "Update %s created for problem %d; by %s" msgstr "Aktualizujte %s pro hlášení %d; vytvořené uživatelem %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Aktualizace níže byly přidána anonymně v %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Aktualizace níže byly přidána uživatelem %s v %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Aktualizace subjektu" @@ -4707,7 +4768,7 @@ msgstr "Nastavte označené hlášení za vyřešené" msgid "Update reopened problem" msgstr "Aktualizovat znovu otevřené hlášení" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Aktualizovat status" @@ -4725,14 +4786,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Aktualizováno!" @@ -4757,12 +4818,12 @@ msgstr "Aktualizace hlášení {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4772,15 +4833,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4789,48 +4850,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Uživatel vyjmut ze sledování" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Uživatel sledován" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Při vyhledávání byly nalezeny shody v uživatelských jménech nebo e-mailových adresách." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4839,20 +4900,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Uživatelé" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Hodnoty aktualizovány" @@ -4886,12 +4947,12 @@ msgstr "Zobrazení hlášení podle okrsků" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Zobrazení oblastí" @@ -4926,7 +4987,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Uvědomujeme si, že za tento problém by mohl být odpovědný % s; Nicméně, nemáme na ně v současné době žádné kontaktní údaje. Pokud příslušné kontakty znáte, sem s nimi. " @@ -4941,8 +5002,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Osobní údaje budeme používat pouze v souladu s našimi zásadami ochrany osobních údajů." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4956,8 +5017,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Editováno:" @@ -4977,14 +5042,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -5005,15 +5066,19 @@ msgstr "Chcete se podílet na rozvoji projektu FixMyStreet? Náš kód je open s msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Můžeme Vám za měsíc odeslat další dotazník, který Vám připomene zkontrolovat stav Vašeho hlášení?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Psaní zprávy pouze hůlkovým písmem je těžké číst, stejně jako chybějící interpunkce." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5022,20 +5087,19 @@ msgstr "Psaní zprávy pouze hůlkovým písmem je těžké číst, stejně jako #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ano" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Stěžujete si, že toto hlášení bylo bezdůvodně moderováno:" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5043,7 +5107,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Upozornění na níže uvedené hlášení, které může být urážlivé, obsahující osobní údaje či jiné nevhodné vyjádření." -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Upozorňuji na níže uvedený záznam, který může obsahovat urážlivé nebo osobní informace, případně jiný problematický text:" @@ -5056,7 +5120,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Můžete zobrazit hlášení na tomto webu." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Můžete přidat e-mail zneužívajícího uživatele do seznamu zneužívání a hlášení těchto uživatelů budou skryty (nikdy nebudou odesílány)." @@ -5064,7 +5128,7 @@ msgstr "Můžete přidat e-mail zneužívajícího uživatele do seznamu zneuž msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Můžete kontaktovat technickou podporu %s" @@ -5084,15 +5148,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Pomozte nám najít email na kontaktní osobu pro oblast %s a pošlete nám kontakt na adresu %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Pokud nechcete, aby byl subjekt dále na serveru aktivní, můžete ho označit za smazaný." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Odmítnuto; vyplňte rámeček nahoře" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5158,7 +5222,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Musíte přidat nějaké subjekty (například úřady či oddělení) kterým pak budou zasílány hlášení." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5183,9 +5247,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Váš e-mail" @@ -5201,10 +5266,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Vámi poskytnuté informace budou použity pouze v souladu se zásadami ochrany osobních údajů" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Vaše jméno a příjmení" @@ -5220,7 +5285,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5243,7 +5308,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Vaše telefonní číslo:" @@ -5268,7 +5333,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5285,25 +5350,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5337,8 +5401,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "editace uživatele" @@ -5347,12 +5411,12 @@ msgstr "editace uživatele" msgid "from %s different users" msgstr "od %s různých uživatelů" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "naposledy upravené %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "méně než minutou" @@ -5363,7 +5427,7 @@ msgid "n/a" msgstr "neuvedeno" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5403,7 +5467,7 @@ msgstr "původně zadáno: “%s”" msgid "other areas:" msgstr "ostatní oblasti:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5411,7 +5475,7 @@ msgstr "" msgid "sign out" msgstr "odhlásit" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5428,19 +5492,19 @@ msgstr "V mapě se nenalézají žádné značky hlášení od uživatelů" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "tento typ lokálního problému" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "dnes" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5456,11 +5520,11 @@ msgstr "uživatel je ze stejného úřadu jako hlášení - %d" msgid "user is problem owner" msgstr "uživatel je vlastníkem hlášení" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5469,7 +5533,7 @@ msgstr "" msgid "ward" msgstr "okrsek" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5478,7 +5542,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5487,7 +5551,7 @@ msgstr[1] "%d dny" msgstr[2] "%d dní" msgstr[3] "%d dní" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5496,7 +5560,7 @@ msgstr[1] "%d hodiny" msgstr[2] "%d hodin" msgstr[3] "%d hodin" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5505,7 +5569,7 @@ msgstr[1] "%d minuty" msgstr[2] "%d minut" msgstr[3] "%d minut" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5523,7 +5587,7 @@ msgstr[1] "%d podporovatelé" msgstr[2] "%d podporovatelů" msgstr[3] "%d podporovatelů" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5532,7 +5596,7 @@ msgstr[1] "%d týdny" msgstr[2] "%d týdnů" msgstr[3] "%d týdnů" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5622,7 +5686,7 @@ msgstr[1] "%s aktalizovan hlášení" msgstr[2] "%s aktualizovaných hlášení" msgstr[3] "%s aktualizovaných hlášení" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5649,7 +5713,7 @@ msgstr[1] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu. msgstr[2] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu." msgstr[3] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index e383e65f8ea..dcd76580049 100644 --- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n" "Language: cy\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "a" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "a" msgid " or " msgstr "neu" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "" @@ -48,7 +48,7 @@ msgstr "" msgid "%d to %d of %d" msgstr "%d i %d o %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(heb ei anfon at y cyngor)" @@ -163,11 +163,11 @@ msgstr "(heb ei anfon at y cyngor)" msgid "(optional)" msgstr "(dewisol)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(anfonwyd i'r ddau)" @@ -176,13 +176,13 @@ msgstr "(anfonwyd i'r ddau)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -232,11 +232,11 @@ msgstr "Nac oes, gadewch i fi gadarnhau'r diweddariad drwy e-bo msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Ychwanegu corff" @@ -291,8 +291,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Ychwanegu categori newydd" @@ -307,27 +307,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -335,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "Ychwanegwyd %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "Rhoi gwybod am ddiweddariadau i ddod" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "Pob adroddiad rhwng %s a %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Dienw:" @@ -445,29 +448,29 @@ msgstr "Dienw:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -488,11 +491,11 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "" @@ -504,8 +507,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Yn ôl" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -554,10 +557,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "Cyrff" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Corff" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Corff:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -592,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "Categori" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "Newid cyfrinair" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -678,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -720,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,17 +773,17 @@ msgstr "" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Cadarnhau" @@ -797,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Cadarnhawyd" @@ -829,7 +836,11 @@ msgstr "Cysylltu â'r tîm" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -838,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Methu dod o hyd i'r lleoliad" @@ -851,9 +862,11 @@ msgstr "Methu dod o hyd i'r lleoliad" msgid "Council" msgstr "Cyngor" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "" @@ -882,8 +895,8 @@ msgstr "Creu adroddiad" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Creu categori" @@ -891,15 +904,15 @@ msgstr "Creu categori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +926,7 @@ msgstr "" msgid "Created" msgstr "Crëwyd" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -936,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Ar hyn o bryd does dim cyrff." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -969,32 +982,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Dilëwyd" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1010,18 +1023,18 @@ msgstr "Disgrifiad" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Manylion" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1032,7 +1045,7 @@ msgstr "Manylion:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -1041,24 +1054,24 @@ msgstr "" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1067,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1083,19 +1096,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1103,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1112,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Golygu" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Golygu manylion y corff" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1136,15 +1149,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1167,28 +1180,28 @@ msgstr "Golygu'r broblem %d" msgid "Editing update %d" msgstr "Golygu'r diweddariad %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Golygu'r defnyddiwr %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Golygydd" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-bost" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1217,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "E-bost:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1255,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1264,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1281,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1303,10 +1316,6 @@ msgstr "Rhowch god post, neu enw stryd ac ardal" msgid "Enter a nearby street name and area" msgstr "Rhowch enw stryd ac ardal gerllaw" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Rhowch fanylion am y broblem" @@ -1320,13 +1329,13 @@ msgstr "Rhowch fanylion am y broblem" msgid "Error" msgstr "Gwall" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Cod post enghreifftiol %s" @@ -1338,11 +1347,11 @@ msgstr "Enghraifft:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1359,7 +1368,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "URL allanol" @@ -1380,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Data ychwanegol:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1421,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Tro cyntaf" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1445,9 +1455,9 @@ msgstr "" msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "" @@ -1455,8 +1465,8 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "" @@ -1464,7 +1474,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1473,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "" @@ -1489,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1503,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Wedi anghofio eich cyfrinair?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1523,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Derbyn diweddariadau" @@ -1553,9 +1565,9 @@ msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1565,7 +1577,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1624,11 +1636,11 @@ msgstr "Cudd" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1649,9 +1661,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Cuddio'r piniau" @@ -1668,11 +1680,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Hanes" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Hafan" @@ -1680,7 +1692,7 @@ msgstr "Hafan" msgid "How to report a problem" msgstr "Sut i adrodd problem" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Sut i anfon adroddiadau llwyddiannus" @@ -1702,7 +1714,7 @@ msgstr "" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1711,8 +1723,8 @@ msgstr "" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1734,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1752,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Os cewch chi ragor o wybodaeth am statws eich problem, dychwelwch i'r wefan i adael diweddariad." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1779,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID annerbynniol" @@ -1814,7 +1830,7 @@ msgstr "ID annerbynniol" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1826,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1842,15 +1858,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1858,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "Nodiadau mewnol" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1866,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1892,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1905,8 +1921,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Golygydd diwethaf" @@ -1922,17 +1938,17 @@ msgstr "Diweddariad diwethaf:" msgid "Last update:" msgstr "Diweddariad diwethaf:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1940,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Rhestru'r holl broblemau a adroddwyd" @@ -1984,16 +2000,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2001,23 +2017,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "MAP" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Map" @@ -2025,15 +2041,15 @@ msgstr "Map" msgid "Mark as sent" msgstr "Nodi ei fod wedi'i anfon" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Neges" @@ -2049,19 +2065,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "jurisdiction_id coll" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2069,10 +2085,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2090,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "Mis" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2107,11 +2123,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2120,7 +2136,7 @@ msgstr "Enw" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Enw:" @@ -2130,11 +2146,11 @@ msgstr "Enw:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2146,7 +2162,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2170,11 +2186,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Ychwanegwyd corff newydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "" @@ -2210,23 +2226,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2234,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Problemau newydd i {{COUNCIL}} o fewn ward {{WARD}} ar FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2270,11 +2286,11 @@ msgstr "" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2286,10 +2302,10 @@ msgstr "Nesaf" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2297,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "" @@ -2309,11 +2324,7 @@ msgstr "" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Dim corff" @@ -2321,7 +2332,7 @@ msgstr "Dim corff" msgid "No council selected" msgstr "" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "" @@ -2338,11 +2349,11 @@ msgstr "" msgid "No further updates" msgstr "Dim diweddariadau pellach" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2350,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Dim canlyniadau" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2372,15 +2383,15 @@ msgstr "Dim cefnogwyr" msgid "None" msgstr "Dim" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2400,13 +2411,13 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Nodyn" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Nodyn:" @@ -2430,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "Iawn" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2446,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "Hen gyflwr" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2466,7 +2477,7 @@ msgstr "" msgid "Open" msgstr "Ar agor" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2474,7 +2485,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 i weinydd mySociety FixMyStreet" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2506,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "" @@ -2541,8 +2552,8 @@ msgstr "" msgid "Page Not Found" msgstr "Ni chanfuwyd y dudalen" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Rhiant" @@ -2556,19 +2567,19 @@ msgstr "Rhannol" msgid "Password (optional)" msgstr "Cyfrinair (dewisol)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Dolen barhaol" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2588,17 +2599,16 @@ msgstr "Rhif ffôn (dewisol)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Ffôn:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2609,6 +2619,7 @@ msgstr "Ffôn:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2623,7 +2634,7 @@ msgstr "Llun" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2652,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Byddwch yn gwrtais, yn gryno ac yn berthnasol." @@ -2673,7 +2688,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,11 +2696,11 @@ msgstr "" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "" @@ -2694,8 +2709,9 @@ msgstr "" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2711,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Peidiwch â bod yn sarhaus — byddai sarhau eich cyngor yn dibrisio'r gwasanaeth i bawb." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Rhowch neges" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,90 +2741,90 @@ msgstr "Rhowch neges" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Rhowch gyfrinair" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Rhowch bwnc" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Rhowch e-bost dilys" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Rhowch gyfeiriad e-bost dilys" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Rhowch fanylion" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Rhowch eich e-bost" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Rhowch eich enw cyntaf" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Rhowch eich enw llawn, mae angen y wybodaeth hon ar y cyngor – os na hoffech ddatgelu eich enw ar y wefan, dad-diciwch y blwch isod" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Rhowch eich enw" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Rhowch eich rhif ffôn" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Rhowch eich cyfenw" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Rhowch eich teitl" @@ -2836,7 +2852,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2862,11 +2878,11 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2902,16 +2918,16 @@ msgstr "Dywedwch a gafodd y broblem ei thrwsio" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Ysgrifennwch neges" @@ -2947,12 +2963,12 @@ msgstr "" msgid "Previous" msgstr "Blaenorol" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2966,14 +2982,18 @@ msgstr "Preifatrwydd" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Preifat" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -2996,7 +3016,7 @@ msgstr "Anfonwyd y broblem %s at y cyngor" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "" @@ -3004,7 +3024,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemau" @@ -3029,7 +3049,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3054,8 +3074,8 @@ msgstr "" msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Darparu diweddariad" @@ -3081,7 +3101,7 @@ msgstr "" msgid "Public response:" msgstr "Ymateb cyhoeddus:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3106,6 +3126,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -3129,11 +3150,11 @@ msgstr "Ffrwd RSS ar gyfer ward %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "Ffrwd RSS %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "Ffrwd RSS %s, o fewn ward %s" @@ -3141,7 +3162,7 @@ msgstr "Ffrwd RSS %s, o fewn ward %s" msgid "RSS feed of nearby problems" msgstr "Ffrwd RSS o broblemau gerllaw" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3161,6 +3182,14 @@ msgstr "Ffrwd RSS o broblemau lleol diweddar" msgid "RSS feed of updates to this problem" msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3180,11 +3209,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Problemau a adroddwyd yn ddiweddar" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3196,7 +3225,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3210,9 +3239,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3238,20 +3267,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Adrodd problem" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3261,7 +3290,7 @@ msgstr "" msgid "Report abuse" msgstr "Adrodd camddefnydd" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3295,17 +3324,18 @@ msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddienw am %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Adroddwyd eisoes" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -3349,28 +3379,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Adrodd problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Adroddiadau" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3382,7 +3412,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3394,15 +3424,15 @@ msgstr "" msgid "Reports published" msgstr "Adroddiadau a gyhoeddwyd" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3410,11 +3440,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3454,20 +3484,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Y lle cywir?" @@ -3479,15 +3509,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Cylchdroi i'r chwith" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3498,23 +3528,23 @@ msgstr "Cylchdroi i'r dde" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Cadw'r newidiadau" @@ -3523,12 +3553,12 @@ msgstr "Cadw'r newidiadau" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3538,7 +3568,8 @@ msgstr "" msgid "Search Reports" msgstr "Chwilio am adroddiadau" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Chwilio am ddefnyddwyr" @@ -3547,7 +3578,7 @@ msgid "Search reports" msgstr "Chwilio am adroddiadau" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Chwilio:" @@ -3557,7 +3588,7 @@ msgstr "Chwilio:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3573,17 +3604,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "" @@ -3603,15 +3635,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3620,7 +3652,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3647,7 +3679,7 @@ msgstr "Gwasanaeth:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3656,9 +3688,9 @@ msgid "Share" msgstr "Rhannu" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3666,15 +3698,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3686,7 +3718,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Dangos fy enw yn gyhoeddus" @@ -3698,21 +3730,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Dangos piniau" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3755,8 +3787,8 @@ msgstr "Allgofnodi" msgid "Some categories may require additional information." msgstr "Gall rhai categorïau ofyn am wybodaeth bellach." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3771,6 +3803,14 @@ msgstr "Lluniau o adroddiadau diweddar" msgid "Some text to localize" msgstr "Testun i'w leoleiddio" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3788,7 +3828,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Mae'n ddrwg gennym, bu gwall tra'n cadarnhau eich problem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3810,7 +3850,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3820,15 +3860,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3836,31 +3876,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Cyflwr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3873,14 +3914,14 @@ msgstr "" msgid "State:" msgstr "Cyflwr:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3896,7 +3937,7 @@ msgid "Status" msgstr "Statws" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3909,7 +3950,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3917,12 +3958,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Pwnc" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Pwnc:" @@ -3940,7 +3981,7 @@ msgstr "Cyflwyno" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3961,7 +4002,8 @@ msgstr "Cyflwynwyd" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Tanysgrifio" @@ -3969,21 +4011,29 @@ msgstr "Tanysgrifio" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4003,11 +4053,11 @@ msgstr "Adroddiadau" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4025,8 +4075,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4036,7 +4086,7 @@ msgstr "" msgid "Text" msgstr "Testun" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Fersiwn testun yn unig" @@ -4080,7 +4130,7 @@ msgstr "Diolch, mae'n dda gennym glywed y cafodd ei drwsio! Gawn ni ofyn a ydych msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4094,11 +4144,11 @@ msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arn msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." @@ -4110,53 +4160,53 @@ msgstr "Ni ellir gweld yr adroddiad hwnnw ar %s." msgid "That report has been removed from FixMyStreet." msgstr "Tynnwyd yr adroddiad oddi ar FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4166,8 +4216,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4182,12 +4232,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Y gwall oedd: %s" @@ -4233,7 +4283,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4254,20 +4304,20 @@ msgstr "Ni chanfuwyd yr URL '%s' ar y gweinydd hwn" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4279,7 +4329,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Nid oes unrhyw adroddiadau i'w dangos." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4287,8 +4341,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Bu gwall dangos y dudalen hon. Rhowch gynnig arall arni nes ymlaen." @@ -4310,7 +4364,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Bu gwallau gyda'r adroddiad. Gwelwch isod." @@ -4327,8 +4381,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4337,7 +4391,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4355,36 +4409,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" @@ -4401,7 +4454,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4417,12 +4474,16 @@ msgstr "Ni thrwsiwyd y broblem hon" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4443,7 +4504,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Mae'r dudalen we hon yn cynnwys llun o'r broblem, a ddarparwyd gan y defnyddiwr." @@ -4454,7 +4515,7 @@ msgstr "Mae'r dudalen we hon yn cynnwys llun o'r broblem, a ddarparwyd gan y def msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" @@ -4492,7 +4553,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4521,34 +4582,34 @@ msgstr "" msgid "Total" msgstr "Cyfanswm" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Ceisio eto" @@ -4567,16 +4628,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4594,7 +4655,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Gwall anhysbys" @@ -4607,7 +4668,7 @@ msgstr "Gwall anhysbys" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4620,7 +4681,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4629,16 +4690,16 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4663,7 +4724,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4681,14 +4742,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Diweddarwyd!" @@ -4713,12 +4774,12 @@ msgstr "Diweddariadau ar {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4728,15 +4789,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4745,48 +4806,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4795,20 +4856,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Defnyddwyr" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4842,12 +4903,12 @@ msgstr "Gweld adroddiadau yn ôl ward" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4882,7 +4943,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4897,8 +4958,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Rydym ond yn defnyddio eich gwybodaeth bersonol yn unol â'n polisi preifatrwydd." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4912,8 +4973,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "Ymatebwn cyn gynted â phosib." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "" @@ -4933,14 +4998,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4961,15 +5022,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Hoffech chi dderbyn holiadur arall ymhen 4 wythnos, i'ch atgoffa i wirio'r statws?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Mae ysgrifennu eich holl neges mewn priflythrennau yn ei gwneud hi'n anodd i'w darllen, ac felly hefyd diffyg atalnodi." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4978,20 +5043,19 @@ msgstr "Mae ysgrifennu eich holl neges mewn priflythrennau yn ei gwneud hi'n ano #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -4999,7 +5063,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5012,7 +5076,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Gallwch weld y broblem ar y wefan hon." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5020,7 +5084,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Gallwch gysylltu â'n tîm cymorth technegol drwy %s" @@ -5038,15 +5102,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Gwrthodoch chi; llenwch y blwch uchod" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5112,7 +5176,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5134,9 +5198,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Eich e-bost" @@ -5152,10 +5217,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Eich enw" @@ -5171,7 +5236,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5194,7 +5259,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Eich rhif ffôn" @@ -5219,7 +5284,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5236,25 +5301,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5288,8 +5352,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5298,12 +5362,12 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "diweddarwyd ddiwethaf %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "llai na munud" @@ -5314,7 +5378,7 @@ msgid "n/a" msgstr "ddim yn berthnasol" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5354,7 +5418,7 @@ msgstr "" msgid "other areas:" msgstr "ardaloedd eraill:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5362,7 +5426,7 @@ msgstr "" msgid "sign out" msgstr "allgofnodi" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5379,19 +5443,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "heddiw" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5407,11 +5471,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5420,7 +5484,7 @@ msgstr "" msgid "ward" msgstr "ward" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5429,7 +5493,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5438,7 +5502,7 @@ msgstr[1] "%d ddiwrnod" msgstr[2] "%d o ddiwrnodau" msgstr[3] "%d diwrnod" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5447,7 +5511,7 @@ msgstr[1] "%d awr" msgstr[2] "%d o oriau" msgstr[3] "%d awr" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5456,7 +5520,7 @@ msgstr[1] "%d funud" msgstr[2] "%d o funudau" msgstr[3] "%d munud" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5474,7 +5538,7 @@ msgstr[1] "%d gefnogwr" msgstr[2] "%d o gefnogwyr" msgstr[3] "%d cefnogwr" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5483,7 +5547,7 @@ msgstr[1] "%d wythnos" msgstr[2] "%d o wythnosau" msgstr[3] "%d wythnos" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5573,7 +5637,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5600,7 +5664,7 @@ msgstr[1] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." msgstr[2] "Nid oes gennym fanylion am y cyngor sy'n rheoli'r lleoliad hwn." msgstr[3] "Nid oes gennym fanylion am y cynghorau sy'n rheoli'r lleoliad hwn." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po index 3acf077f311..8e67dac9202 100644 --- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Danish (Denmark) (https://www.transifex.com/mysociety/teams/12067/da_DK/)\n" "Language: da_DK\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr " og " -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr " og " msgid " or " msgstr " eller " -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d redigeringer af %s" @@ -48,7 +48,7 @@ msgstr "%d redigeringer af %s" msgid "%d to %d of %d" msgstr "%d til %d af %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(som graffite, affald, hul i vejen, eller ødelagt gadelys)" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(ikke rapporteret til myndigheden)" @@ -163,11 +163,11 @@ msgstr "(ikke rapporteret til myndigheden)" msgid "(optional)" msgstr "(valgfrit)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -176,13 +176,13 @@ msgstr "(sendt til begge)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Vælg en kategori --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -232,11 +232,11 @@ msgstr "Nej Lad mig bekræfte min opdatering med e-post" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "Tilføj en administration for hver administrativ instans, for eksempel en kommune eller et departement, hvortil problemrapporter kan sendes. Du kan tilføje en eller flere kontaktpunkter (for forskellige problemkategorier) for hver myndighed." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Tilføj en kontakt ved at bruge formularen nedenfor." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Tilføj myndighed" @@ -291,8 +291,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Tilføj ny kategori" @@ -307,27 +307,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Tilføj bruger" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -335,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "Tilføjede %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "Send mig varsel ved fremtidige opdateringer" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "Alle rapporter mellem %s og %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonym:" @@ -445,29 +448,29 @@ msgstr "Anonym:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Dækket område" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Da reproduktionsstedet og %s ikke stemmer, vil beskeden som er lavet her, blive sendt til problemrapportøren, og ikke til kontakten som er givet for beskedformålet." @@ -488,11 +491,11 @@ msgstr "Tildel til ekstern myndighed:" msgid "Assign to subdivision:" msgstr "Tildelt underafdeling:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Tildelt %s" @@ -504,8 +507,8 @@ msgstr "Højst %d forespørgsler bliver returneret i hver forespørgsel. De ret msgid "At the moment only searching for and looking at reports work." msgstr "For øjeblikket er det kun søgning efter og at visning af rapporter som fungerer." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Afventer moderation" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Tilbage" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -554,10 +557,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "Administrationer" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Administration" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Administration:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -592,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Hvis du ikke kan se kortet, så overspring dette trin." -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uger gamle" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "Skift adgangskode" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -683,17 +686,17 @@ msgstr "" "Dette er passerende når du ønsker at tillade brugere at indsende besked til myndigheden, men ikke vil vise\n" "den udadtil. I England har de brugt dette til opgaver som at bede om en ekstra papirkurv på et bestemt sted." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Vælg et kategorinavn som giver mening for indbyggerne (f.eks. \"Hul i vejen\", \"Gadebelysning\") men som også er nyttigt for myndigheden. Disse vil dukke op i rullegardinmenuen på rapportér-et-problem-siden." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -725,9 +728,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -771,17 +778,17 @@ msgstr "Mærkevaresamarbejde:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Opsætning" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Bekræft" @@ -802,9 +809,9 @@ msgstr "" msgid "Confirmation" msgstr "Bekræftelse" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Bekræftet" @@ -834,7 +841,11 @@ msgstr "Kontakt projektgruppen" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -843,12 +854,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Kunne ikke finde bruger" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Kunne ikke finde position" @@ -856,9 +867,11 @@ msgstr "Kunne ikke finde position" msgid "Council" msgstr "Administration" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Administrationskontakter for %s" @@ -887,8 +900,8 @@ msgstr "Lav en rapport" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Lav kategori" @@ -896,15 +909,15 @@ msgstr "Lav kategori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -918,7 +931,7 @@ msgstr "" msgid "Created" msgstr "Oprettet" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -941,12 +954,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "I øjeblikket er der ikke lavet nogen instanser." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -974,32 +987,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Slettet" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1015,18 +1028,18 @@ msgstr "Beskrivelse" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detaljer" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1037,7 +1050,7 @@ msgstr "Detaljer:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Delegeret" @@ -1046,24 +1059,24 @@ msgstr "Delegeret" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Arbejdsheste" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1072,7 +1085,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1080,7 +1093,7 @@ msgstr "" msgid "Don’t know" msgstr "Véd ikke" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Kan du ikke lide skemaer?" @@ -1088,19 +1101,19 @@ msgstr "Kan du ikke lide skemaer?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1111,8 +1124,8 @@ msgstr "" "Forskellige kategorier kan have same kontakt (e-postadresse).\n" "Dette betyder at du kan tilføje mange grupper/kategorier selv om du bare har én kontakt for myndigheden." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1120,23 +1133,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Redigér" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Redigér detaljer for myndighed" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1144,15 +1157,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1175,28 +1188,28 @@ msgstr "Redigér problem %d" msgid "Editing update %d" msgstr "Redigerer opdatering %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Redigerer bruger %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Opdateret af" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-post" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1225,37 +1238,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "E-post:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1263,8 +1276,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1275,8 +1288,8 @@ msgstr "" "opdateringer til eksidsterende rapporter. Hvis du ikke er sikker, sker det nok ikke, så lad den forblive uafkrydset. For mere information, se\n" "denne artikel." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1286,8 +1299,8 @@ msgstr "" "et et forskelligt leveringspunkt (og sendemetode) fra myndigheden. For eksempel hvis nogen beskedstyper enten skal \n" " e-postes, mens andre kan sendes med Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1295,7 +1308,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Endepunkt" @@ -1317,10 +1330,6 @@ msgstr "Indtast postnummer i nærheden, eller vejnavn og sted" msgid "Enter a nearby street name and area" msgstr "Indtast et vejnavn og sted" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Indtast detaljer om problemet" @@ -1334,13 +1343,13 @@ msgstr "Indtast detaljer om problemet" msgid "Error" msgstr "Fejl" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Eksempel-postnummer %s" @@ -1352,11 +1361,11 @@ msgstr "Eksempler:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1373,7 +1382,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "Eksternt link" @@ -1394,25 +1403,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Ekstra data:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1435,11 +1444,12 @@ msgstr "" msgid "Filter report list" msgstr "Filtrér rapportliste" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Første gang" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Fiks dette ved at vælge en area covered i Edit body details-skemaet nedenfor." @@ -1459,9 +1469,9 @@ msgstr "Løst - Administration" msgid "Fixed - User" msgstr "Løst - Bruger" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Markér som slettet" @@ -1469,8 +1479,8 @@ msgstr "Markér som slettet" msgid "Flag user" msgstr "Markér bruger" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Markeret:" @@ -1478,7 +1488,7 @@ msgstr "Markeret:" msgid "Flagged reports and users" msgstr "Markerede rapporter og brugere" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Markerede brugere er listet op på Markerede-siden." @@ -1487,7 +1497,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Markerede brugere er ikke begrænset på noget måde. Dette er bare en liste med brugere som er blevet markeret for at give dem opmærksomhed." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Markeret:" @@ -1503,7 +1513,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "For mere information, se Hvordan FixMyStreet bruger Mapit." @@ -1517,11 +1527,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Glemt din adgangskode?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1537,6 +1547,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Få opdateringer" @@ -1567,9 +1579,9 @@ msgstr "Glad for at høre at det er i orden!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1579,7 +1591,7 @@ msgstr "Søg" msgid "Going to send questionnaire?" msgstr "Skal der sendes spørgeskema?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1587,7 +1599,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Graf over problemoprettelse fordelt på status over tid" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1638,11 +1650,11 @@ msgstr "Skjul" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1663,9 +1675,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Skjul nåle" @@ -1682,11 +1694,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Historie" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Hjem" @@ -1694,7 +1706,7 @@ msgstr "Hjem" msgid "How to report a problem" msgstr "Hvordan rapporteres et problem" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Hvordan indsendes rapporter som er løst" @@ -1716,7 +1728,7 @@ msgstr "Jeg er bange for at vi ikke kunne finde dit problem i databasen.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1725,8 +1737,8 @@ msgstr "Jeg er bange for at vi ikke kunne finde dit problem i databasen.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1748,13 +1760,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Hvis to eller flere instanser er lokaliseret på samme sted, kombinerer FixMinVej identiske kategorier i en enkelt opføring i menuen. Kontrollér at du bruger samme kategorinavn for instanserne, hvis det er det du ønsker." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1766,6 +1778,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Hvis du får mere information om status for dit problem, så vær sød at komme tilbage til netstedet og lav en opdatering." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1793,34 +1809,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Hvis du bruger en sendemetode som ikke er e-post, så indtast tjeneste-ID (Open311) eller tilsvarende identifikator her." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Ugyldigt ID" @@ -1828,7 +1844,7 @@ msgstr "Ugyldigt ID" msgid "Illegal feed selection" msgstr "Ugyldigt valg af feed" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1840,7 +1856,7 @@ msgstr "I misbrugstabel?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Yderligere bliver følgende attributter, som ikke er del af Open311 v2-specifikationen, returneret: agency_sent_datetime, title (også returneret som del af description), interface_used, comment_count, requestor_name (kun tilstede hvis indsender tillod at navnet kunne vises på dette netsted)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1856,15 +1872,15 @@ msgstr "Inkludér rapportørens personlige detaljer" msgid "Incorrect has_photo value \"%s\"" msgstr "Forkert has_photo-værdi \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1872,7 +1888,7 @@ msgstr "" msgid "Internal notes" msgstr "Interne notater" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1880,12 +1896,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-værdi %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Ugyldigt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1906,7 +1922,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1919,8 +1935,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Sidst redigeret af" @@ -1936,17 +1952,17 @@ msgstr "Sidste opdatering:" msgid "Last update:" msgstr "Sidste opdatering:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Lad denne være blank hvis alle rapporter til denne myndighed skal sendes ved hjælp af samme sende-metode (dvs. \"%s\")." @@ -1954,7 +1970,7 @@ msgstr "Lad denne være blank hvis alle rapporter til denne myndighed skal sende msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "List alle rapporterede problemer" @@ -1998,16 +2014,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2015,23 +2031,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "KORT" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Kort" @@ -2039,15 +2055,15 @@ msgstr "Kort" msgid "Mark as sent" msgstr "Markér som afsendt" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Markér brugere hvis adfærd du ønsker at have tjek på som markeret." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Besked" @@ -2063,19 +2079,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2083,10 +2099,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2104,12 +2120,12 @@ msgstr "" msgid "Month" msgstr "Måned" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2121,11 +2137,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2134,7 +2150,7 @@ msgstr "Navn" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Navn:" @@ -2144,11 +2160,11 @@ msgstr "Navn:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2160,7 +2176,7 @@ msgstr "Nærmeste navngivne vej til nålen placeret på kortet (automatisk gener msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Nærmeste postnummer for nålen placeret på kortet (automatisk genereret): %s (%sm væk)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Nærmeste vej for nålen placeret på kortet (automatisk genereret ved hjælp af Bing Maps): %s" @@ -2186,11 +2202,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Ny myndighed tilføjet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Ny kategorikontakt tilføjet" @@ -2226,23 +2242,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2250,7 +2266,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Nye problemer for {{COUNCIL}} indenfor {{WARD}} bydel på FixMinVej" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2286,11 +2302,11 @@ msgstr "Ny tilstand" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2302,10 +2318,10 @@ msgstr "Næste" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2313,11 +2329,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Nej" @@ -2325,11 +2340,7 @@ msgstr "Nej" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Ingen myndighed" @@ -2337,7 +2348,7 @@ msgstr "Ingen myndighed" msgid "No council selected" msgstr "Ingen myndighed er valgt" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Ingen ændringer er blevet gjort." @@ -2354,11 +2365,11 @@ msgstr "Fant ingen markerede brugere." msgid "No further updates" msgstr "Ikke flere opdateringer" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2366,12 +2377,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Ingen resultater returneret" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2391,15 +2402,15 @@ msgstr "Ingen supportere" msgid "None" msgstr "Ingen" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2423,13 +2434,13 @@ msgstr "Ikke rapporteret tidligere" msgid "Not reported to council" msgstr "Ikke rapporteret til myndigheden" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Bemærk" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Bemærk:" @@ -2453,15 +2464,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2469,16 +2480,16 @@ msgstr "" msgid "Old state" msgstr "Gammel tilstand" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2489,7 +2500,7 @@ msgstr "" msgid "Open" msgstr "Åben" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2497,7 +2508,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311-API for mySocietys FixMinVej-server" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2529,17 +2540,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Andet" @@ -2564,8 +2575,8 @@ msgstr "Ejer" msgid "Page Not Found" msgstr "Fandt ikke siden" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Forælder" @@ -2579,19 +2590,19 @@ msgstr "Delvis" msgid "Password (optional)" msgstr "Adgangskode (valgfrit)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2611,17 +2622,16 @@ msgstr "Telefonnummer (valgfrit)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefon:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2632,6 +2642,7 @@ msgstr "Telefon:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2646,7 +2657,7 @@ msgstr "Billed" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2675,11 +2686,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Placér tegnestiften på kortet" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Vær høflig, præcis og kortfattet." @@ -2696,7 +2711,7 @@ msgstr "Venligst kontrollér adgangskoderne og prøv igen" msgid "Please check your email address is correct" msgstr "Venligst kontrollér at du har skrevet en gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2704,11 +2719,11 @@ msgstr "Venligst kontrollér at du har skrevet en gyldig e-postadresse" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Vælg en kategori" @@ -2717,8 +2732,9 @@ msgstr "Vælg en kategori" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Husk at rette op på fejlene nedenfor." @@ -2734,13 +2750,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Vær ikke ufin — at skælde ud på din myndighed skader værdien af tjenesten for alle brugerne." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Venligst indlæg en besked" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2748,90 +2764,90 @@ msgstr "Venligst indlæg en besked" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Indtast en adgangskode" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Venligst angiv et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Tilføj en gyldig e-post" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Angiv din e-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Angiv oplysninger om problemet" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Angiv din e-post" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Venligst angiv dit fornavn" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Venligst angiv dit fulde navn, myndigheder som modtager dit problem har brug for dette - hvis du ikke ønsker at dit navn skal vises, så fjern hakket nedenfor" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Angiv dit navn" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Angiv dit telefonnummer." -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Venligst angiv dit mellemnavn" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Venligst angiv din titel" @@ -2861,7 +2877,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Venligst indikér om du ønsker at modtage et nyt spørgeskema" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2887,11 +2903,11 @@ msgstr "" msgid "Please note:" msgstr "Venligst bemærk:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2927,16 +2943,16 @@ msgstr "Venligs angiv om dette problem er blevet fikset eller ikke" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Indtast en besked" @@ -2972,12 +2988,12 @@ msgstr "" msgid "Previous" msgstr "Forrige" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2991,14 +3007,18 @@ msgstr "Personliv" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privat" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -3021,7 +3041,7 @@ msgstr "Problem %s sendt til myndighed %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling af problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problem markeret som åbent." @@ -3029,7 +3049,7 @@ msgstr "Problem markeret som åbent." msgid "Problem state change based on survey results" msgstr "Problemtilstandsændring baseret på spørgeundersøgelsesresultater" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemer" @@ -3054,7 +3074,7 @@ msgstr "Problemer nyligt rapporteret fikset på FixMinVej" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3079,8 +3099,8 @@ msgstr "" msgid "Property address:" msgstr "Ejendomsadresse:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Bidrag med en opdatering" @@ -3106,7 +3126,7 @@ msgstr "" msgid "Public response:" msgstr "Offentlig respons:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3131,6 +3151,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Spørgeskema %d sendt for problem %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Spørgeskema udfyldt af fejlrapportøren" @@ -3154,11 +3175,11 @@ msgstr "RSS-strøm for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm af %s, indenfor %s bydel" @@ -3166,7 +3187,7 @@ msgstr "RSS-strøm af %s, indenfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheden" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3186,6 +3207,14 @@ msgstr "RSS-strøm med nylige lokale problemer" msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med opdateringer for dette problem" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3205,11 +3234,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Nyligt meldte problemer" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3221,7 +3250,7 @@ msgstr "Husk at FixMinVej primært er lavet for at rapportere fysiske problemer msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3235,9 +3264,9 @@ msgstr "Fjern markering" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3263,20 +3292,20 @@ msgstr "" msgid "Report" msgstr "Rapport" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Rapportér et problem" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3286,7 +3315,7 @@ msgstr "" msgid "Report abuse" msgstr "Rapportér misbrug" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3320,17 +3349,18 @@ msgid "Report, view, or discuss local problems" msgstr "Rapportér, find eller diskutér lokale problemer" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Rapporteret anonymt %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Rapporteret tidligere" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Publiceret af %s %s" @@ -3374,28 +3404,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Rapporterer et problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Rapporter" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Rapporterne begrænses til %s tegn. Rapporten skal forkortes." -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3407,7 +3437,7 @@ msgstr "Rapporter som venter på godkendelse" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3419,15 +3449,15 @@ msgstr "" msgid "Reports published" msgstr "Publicerede rapporter" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3435,11 +3465,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3479,20 +3509,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Rigtig sted?" @@ -3504,15 +3534,15 @@ msgstr "Vejoperatør for denne navngivne vej (udledt af vejens referencenummer o msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vejoperatør for denne navngivne vej (fra OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rotér til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3523,23 +3553,23 @@ msgstr "Rotér til højre" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelit" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Gem ændringer" @@ -3548,12 +3578,12 @@ msgstr "Gem ændringer" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3563,7 +3593,8 @@ msgstr "" msgid "Search Reports" msgstr "Søg i rapporter" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Søg i brugere" @@ -3572,7 +3603,7 @@ msgid "Search reports" msgstr "Søg i rapporter" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Søg:" @@ -3582,7 +3613,7 @@ msgstr "Søg:" msgid "Searching found no reports." msgstr "Søgningen fandt ingen rapporter." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Søgningen fandt ingen brugere." @@ -3598,17 +3629,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Vælg en myndighed" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Vælg et område" @@ -3628,15 +3660,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3645,7 +3677,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3672,7 +3704,7 @@ msgstr "Tjeneste:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3681,9 +3713,9 @@ msgid "Share" msgstr "Del" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3691,15 +3723,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3711,7 +3743,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Vis mit navn offentligt" @@ -3723,21 +3755,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Vis nåle" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3780,8 +3812,8 @@ msgstr "Log ud" msgid "Some categories may require additional information." msgstr "Nogen kategorier kræver måske mere information" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3799,6 +3831,14 @@ msgstr "Nogen billeder af nylig meldte problemer" msgid "Some text to localize" msgstr "Noget tekst at oversætte" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Beklager det ser ud til at være et \"Crown dependency\"-postnummer, som vi ikke dækker." @@ -3816,7 +3856,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Beklager, men der opstod et problem når vi forsøgte at bekræfte din problemrapport" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3838,7 +3878,7 @@ msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen." msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3848,15 +3888,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3864,31 +3904,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Tilstand" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3901,14 +3942,14 @@ msgstr "" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3924,7 +3965,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3937,7 +3978,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3945,12 +3986,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Underafdeling/myndighed" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Emne" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Emne:" @@ -3968,7 +4009,7 @@ msgstr "Send ind" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3989,7 +4030,8 @@ msgstr "Sendt ind" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Abonnér" @@ -3997,21 +4039,29 @@ msgstr "Abonnér" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4031,11 +4081,11 @@ msgstr "Opsummeringsrapporter" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4053,8 +4103,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4064,7 +4114,7 @@ msgstr "" msgid "Text" msgstr "Tekst" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Tekst-version" @@ -4108,7 +4158,7 @@ msgstr "Tak, glad for at høre at problemet er fikset! Vi vil gjerne spørge dig msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Billedet ser ikke ud til at være blevet lagt op rigtigt (%s), prøv igen." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Det sted dækkes ikke af nogen myndighed, måske det er til søs eller udenfor landet - venligst forsøgm med et andet sted." @@ -4122,11 +4172,11 @@ msgstr "Det sted virker ikke til at være i Storbritannien. Venligst prøv igen. msgid "That postcode was not recognised, sorry." msgstr "Det postnummer blev ikke genkendt, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Det problem er blevet markeret som sendt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Det problem vil nu blive sendt igen." @@ -4138,23 +4188,23 @@ msgstr "Denne rapport kan ikke vises på %s." msgid "That report has been removed from FixMyStreet." msgstr "Den rapport er blevet fjernet fra FixMinVej." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4162,8 +4212,8 @@ msgstr "" "Beskeder om denne kategori bliver sendt til E-postadressen.\n" "For denne myndighed kan også andre kategorier have samme e-postadresse." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4171,15 +4221,15 @@ msgstr "" "Leveringspunktet er netadressen for den tjeneste, FixMinVej vil koble sig til\n" "for beskeder til denne instans." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." @@ -4187,10 +4237,10 @@ msgstr "" "Jurisdiktion er kun nødvendig hvis leveringspunktet betjener mere \n" "end én. Hvis myndigheden kører sit eget leveringspunkt, kan du normalt lade dette stå tomt." -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4202,8 +4252,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Open311 v2-atributten agency_responsible bruges for at opliste myndighederne som modtog problemrapporten, noget som ikke helt stemmer med hvordan atributten er defineret i Open311 v2-specifikationen." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4224,12 +4274,12 @@ msgstr "" " væg), hvad det er, hvor længe det har været der, en beskrivelse (og et billede af\n" " problemet hvis du har et), osv." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "The diligency prize league tabellen viser redaktørernes aktivitet, (hvem som har redigeret flest)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Fejlen var: %s" @@ -4275,7 +4325,7 @@ msgstr "De sidste problemer indenfor grænsen til {{NAME}} rapporteret af bruger msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Listen over tilgængelige områder kommer fra MapIt-tjenesten på %s." @@ -4296,20 +4346,20 @@ msgstr "Den forespurgte URL '%s' blev ikke fundet på denne server" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Brugeren kunne ikke placere problemet på et kort, men kontrollér området omkring stedet de angav" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4323,7 +4373,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Der er ingen rapporter at vise." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4331,8 +4385,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Der var problemer med at vise 'Alle rapporter'-siden. Venligst prøv igen senere." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere." @@ -4354,7 +4408,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Der var problemer med din opdatering. Vær sød at forsøge igen." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Der var problemer med din rapport. Venligst se nedenfor." @@ -4371,8 +4425,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4385,7 +4439,7 @@ msgstr "" "For mere information om Open311, se\n" "denne artikel." -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4403,7 +4457,7 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementation er under udarbejdelse og endnu ikke stabil. Den vil ændre sig uden varsel i fremtiden." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4413,12 +4467,12 @@ msgstr "" "Følgelig vil ingen af kategoriene vises i rullegardinkategori-menuen når brugere rapporterer problemer.\n" "For tiden kan brugerne ikke rapportere problemer til denne myndighed." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Denne instans har ingen kontakter. Det betyder at i øjeblikket vil rapporterede problemer til denne instans ikke blive sendt." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4426,18 +4480,17 @@ msgstr "" "Denne instans får kun rapporter for problemer som er lokaliseret i area covered.\n" "En instans vil ikke få nogen beskeder hvis det ikke dækker mindst ét område." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Denne e-post er blevet sendt til begge myndigheder som dækker stedet for problemet, da brugeren ikke kategoriserede det. Vær sød at ignorere den hvis I ikke er korrekt myndighed for at håndtere denne sag, eller give os besked om hvilken kategori af problemer dette er, så vi kan tilføje det i vores system." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Denne e-post er blevet sendt til flere myndigheder som dækker stedet for problemet, da den valgte kategori er tilgængelig for disse. Vær sød at ignorere e-posten hvis I ikke er korrekt myndighed for at håndtere denne sag." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Denne information er påkrævet" @@ -4454,7 +4507,11 @@ msgstr "Dette er et udviklernetsted.Ting kan gå i stykker når som helst og dat msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4470,12 +4527,16 @@ msgstr "Dette problem er ikke blevet løst" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Denne rapport afventer moderation" @@ -4496,7 +4557,7 @@ msgstr "Denne rapport er for tiden markeret som åben." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Denne netside indeholder også et billede af problemet, sendt ind af brugeren." @@ -4507,7 +4568,7 @@ msgstr "Denne netside indeholder også et billede af problemet, sendt ind af bru msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4545,7 +4606,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "For at se et kort med en mere præsis placering for dette problem." @@ -4574,34 +4635,34 @@ msgstr "" msgid "Total" msgstr "Totalt" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Prøv igen" @@ -4620,16 +4681,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4647,7 +4708,7 @@ msgstr "Ukendt varsel-type" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Ukendt fejl" @@ -4660,7 +4721,7 @@ msgstr "Ukendt fejl" msgid "Unknown problem ID" msgstr "Ukendt problem-Id" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4673,7 +4734,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Opdatering" @@ -4682,16 +4743,16 @@ msgstr "Opdatering" msgid "Update %s created for problem %d; by %s" msgstr "Opdatering %s oprettet for problem %d, af %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Opdateringen nedenfor lagt ind anonymt %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Opdateringen nedenfor tilføjet af %s %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Opdatér myndighed" @@ -4716,7 +4777,7 @@ msgstr "En opdatering markerede dette problem som fikset." msgid "Update reopened problem" msgstr "En opdatering gennåbnede problemet" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Opdatér tilstanden" @@ -4734,14 +4795,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Opdateret!" @@ -4766,12 +4827,12 @@ msgstr "Opdateringer af {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4781,15 +4842,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4798,48 +4859,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Brugermarkering fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Bruger markeret" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Brugersøgning finder træf på brugernavne og epostadresser. " -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4848,20 +4909,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Brugere" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Værdier opdateret" @@ -4895,12 +4956,12 @@ msgstr "Se rapport per bydel" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Ser på et sted" @@ -4935,7 +4996,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Vi indser at %s kan være ansvarlig for dette problem, men vi mangler for tiden kontaktinformation for dem. Hvis du kender en egnet kontaktadresse, så tag kontakt med os." @@ -4950,8 +5011,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Vi vil kun bruge personlig information om dig i henhold til vore privatlivssregler." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4965,8 +5026,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "Vi tager kontakt med dig så snart vi kan." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Hvornår redigeret" @@ -4986,14 +5051,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "Hvorfor stoppe der? Sæt flere varsler op gratis." @@ -5014,15 +5075,19 @@ msgstr "Kunne du tænke dig at bidrage til FixMinVej? Vores kKildekoden er frit msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tænke dig at modtage en ny forespørgsel om 4 uger, som minder dig om at tjekke status?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Når du skriver din besked med kun store bogstaver bliver den vanskelig at læse. Det samme gælder manglende tegnsætning." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5031,20 +5096,19 @@ msgstr "Når du skriver din besked med kun store bogstaver bliver den vanskelig #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Du klager over at denne problemrapport blev modereret uden grund:" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5052,7 +5116,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgende problem er stødende, indeholder personlig information eller lignende:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgende opdatering er stødende, indeholder personlig information, eller lignende:" @@ -5065,7 +5129,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Du kan læse om problemet på denne side." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Du kan føje en misbrugers epostadresse til misbrugslisten, hvilket automatisk skjuler (og aldrig sender) rapporter vedkommende opretter." @@ -5073,7 +5137,7 @@ msgstr "Du kan føje en misbrugers epostadresse til misbrugslisten, hvilket auto msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Du kan kontakte teknisk support via %s" @@ -5093,15 +5157,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Du kan hjælpe os ved at finde en kontakt-e-post for lokale problemer i %s, og sende den via e-post til os på %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Du kan markere en myndighed som slettet hvis du ikke ønsker at den skal være aktiv på dette netsted." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Du afviste; venligst udfyld boksen ovenfor" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5167,7 +5231,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Du skal add some bodies (som kommuner eller afdelinger) før rapporten kan blive sendt. " -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5191,9 +5255,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Din e-post" @@ -5209,10 +5274,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Vi vil kun bruge personlig information om dig i henhold til vores privatlivsregler." +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Dit navn" @@ -5228,7 +5293,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5251,7 +5316,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Dit telefonnummer" @@ -5276,7 +5341,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5293,25 +5358,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5345,8 +5409,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "redigér bruger" @@ -5355,12 +5419,12 @@ msgstr "redigér bruger" msgid "from %s different users" msgstr "fra %s forskellige brugere" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "sidst opdateret %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "mindre end et minut" @@ -5371,7 +5435,7 @@ msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5411,7 +5475,7 @@ msgstr "oprinnelig lagt ind: “%s”" msgid "other areas:" msgstr "andre områder:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5419,7 +5483,7 @@ msgstr "" msgid "sign out" msgstr "log ud" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5436,19 +5500,19 @@ msgstr "Der vises ingen nål på grund af at brugeren ikke brugte kortet" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "denne type lokalt problem" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "idag" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5464,11 +5528,11 @@ msgstr "bruger er fra samme myndighed som problemet - %d" msgid "user is problem owner" msgstr "bruger er ejer af problemet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5477,35 +5541,35 @@ msgstr "" msgid "ward" msgstr "bydel" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dage" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timer" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minutter" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5519,14 +5583,14 @@ msgid_plural "%d supporters" msgstr[0] "%d supporter" msgstr[1] "%d supportere" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d uge" msgstr[1] "%d uger" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5596,7 +5660,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s rapport-
opdatering" msgstr[1] "%s rapport-
opdateringer" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5617,7 +5681,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Vi har endnu ikke detaljer for myndigheden som dækker dette sted." msgstr[1] "Vi har endnu ikke detaljer for myndighederne som dækker dette sted." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index 6e10d89fd0f..6d736ec7d8b 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: German (Switzerland) (https://www.transifex.com/mysociety/teams/12067/de_CH/)\n" "Language: de_CH\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "und" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "und" msgid " or " msgstr "oder" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "" @@ -48,7 +48,7 @@ msgstr "" msgid "%d to %d of %d" msgstr "%d bis %d von %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "" @@ -163,11 +163,11 @@ msgstr "" msgid "(optional)" msgstr "(optional)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "" @@ -176,13 +176,13 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "Vorlage wählen" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr " %s Meldungen %s" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -232,11 +232,11 @@ msgstr "" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Adresse hinzufügen" @@ -291,8 +291,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Füge neue Kategorie hinzu" @@ -307,27 +307,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "User hinzufügen" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Füge neue Kategorie hinzu" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Vorlagen für %s" @@ -335,7 +335,7 @@ msgstr "Vorlagen für %s" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "Alle Meldungen von %s bis %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonym" @@ -445,29 +448,29 @@ msgstr "Anonym" msgid "Another user" msgstr "User hinzufügen" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Gebiet" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -488,11 +491,11 @@ msgstr "Nachricht an zuständige Stelle" msgid "Assign to subdivision:" msgstr "An Fachbereich zuweisen" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "User an Gegenden zuweisen" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Besten Dank für Ihre Meldung. Wir haben Ihr Anliegen an %s weitergeleitet, da es nicht in den Zuständigkeitsbereich der am Pilot beteiligten Fachbereiche fällt.
Freundliche Grüsse
Ihre Stadt Zürich" @@ -504,8 +507,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "Rückmeldung an User" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "Verhindern Sie persönliche Informationen wie Kfz-Kennzeichen oder P msgid "Awaiting moderation" msgstr "Überprüfung ausstehend" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Zurück" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Alle Meldungen" @@ -554,10 +557,10 @@ msgstr "Alle Meldungen" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "Externe Adressen" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Organisation" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Organisation" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -592,7 +595,7 @@ msgstr "Falls Sie kein E-Mail erhalten haben, überprüfen Sie bitte Ihr msgid "Can't see the map? Skip this step" msgstr "Karte nicht sichtbar? Überspringen Sie diesen Schritt" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "Kategorie" msgid "Categories:" msgstr "Kategorie:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "Kategorie" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategorie von ‘%s’ nach ‘%s’ geändert" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "Passwort ändern" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -678,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -720,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,17 +773,17 @@ msgstr "" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Bestätigen" @@ -797,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "Bestätigung" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Bestätigt" @@ -829,7 +836,11 @@ msgstr "" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -838,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinaten" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "" @@ -851,9 +862,11 @@ msgstr "" msgid "Council" msgstr "" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Kontaktdetails von %s" @@ -882,8 +895,8 @@ msgstr "Erfasse eine Meldung" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Kategorie erstellen" @@ -891,15 +904,15 @@ msgstr "Kategorie erstellen" msgid "Create priority" msgstr "Priorität erstellen" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +926,7 @@ msgstr "Vorlage erstellen" msgid "Created" msgstr "Erstellt" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -936,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Bisher wurden noch keine Organisationseinheiten erfasst." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Kunde nicht kontaktierbar" @@ -969,32 +982,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Vorlage löschen" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Gelöscht" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1010,18 +1023,18 @@ msgstr "Beschreibung" msgid "Description:" msgstr "Beschreibung" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Beschreibung" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1032,7 +1045,7 @@ msgstr "Beschreibung" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -1041,24 +1054,24 @@ msgstr "" msgid "Didn't use map" msgstr "hat Karte nicht verwendet" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Weiss ich nicht" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1067,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "Haben Sie ein %s Passwort?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1083,19 +1096,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Fotos hierhin ziehen oder hochladen" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1103,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1112,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Anpassen" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Details editieren" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Kategorie editieren" @@ -1136,15 +1149,15 @@ msgstr "Kategorie editieren" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Priorität editieren" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Meldungen editieren" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1167,28 +1180,28 @@ msgstr "Meldung %d bearbeiten" msgid "Editing update %d" msgstr "" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-Mail" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1217,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "E-mail:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1255,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1264,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1281,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1303,10 +1316,6 @@ msgstr "Ungefähre Adresse des Schadens" msgid "Enter a nearby street name and area" msgstr "Ungefähre Adresse des Schadens" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Beschreiben Sie den Schaden" @@ -1320,13 +1329,13 @@ msgstr "Beschreiben Sie den Schaden" msgid "Error" msgstr "Fehler" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Alles" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Beispieladresse" @@ -1338,11 +1347,11 @@ msgstr "Beispiele:" msgid "Existing category" msgstr "Bestehende Kategorie" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1359,7 +1368,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1380,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "Externes Team" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Zusätzliche Details" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1421,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "Alle Meldungen" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1445,9 +1455,9 @@ msgstr "Beantwortet" msgid "Fixed - User" msgstr "Beantwortet" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Als gelöscht markieren" @@ -1455,8 +1465,8 @@ msgstr "Als gelöscht markieren" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "" @@ -1464,7 +1474,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1473,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "" @@ -1489,7 +1499,7 @@ msgstr "Machen Sie ein Detail- und ein Übersichtsfoto" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1503,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Ihr Passwort" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "An externe Stelle weitergeleitet" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "Wunsch an externe Stelle weitergeleitet" @@ -1523,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "" @@ -1553,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1565,7 +1577,7 @@ msgstr "Los" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Grafik der Meldungen nach Status und Zeit" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1624,11 +1636,11 @@ msgstr "Unsichtbar" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1649,9 +1661,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Stecknadeln ausblenden" @@ -1668,11 +1680,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "History" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "" @@ -1680,7 +1692,7 @@ msgstr "" msgid "How to report a problem" msgstr "Erfassen Sie eine neue Meldung:" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Anleitung" @@ -1702,7 +1714,7 @@ msgstr "" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1711,8 +1723,8 @@ msgstr "" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1734,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1752,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1779,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Unbekannt ID" @@ -1814,7 +1830,7 @@ msgstr "Unbekannt ID" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1826,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1842,15 +1858,15 @@ msgstr "Persönliche Angaben des Meldenden mitsenden" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "Kontrolle notwendig" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1858,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "Interne Notizen" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1866,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1892,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1905,8 +1921,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Letzter Bearbeiter" @@ -1922,17 +1938,17 @@ msgstr "Letzte Bearbeitung" msgid "Last update:" msgstr "Letzte Bearbeitung" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "Älteste Bearbeitung" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1940,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Liste aller Meldungen" @@ -1984,16 +2000,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2001,23 +2017,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2025,15 +2041,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Nachricht" @@ -2049,19 +2065,19 @@ msgstr "Nachricht an zuständige Stelle" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "Meldungsdetails anpassen" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Meldung anpassen" @@ -2069,10 +2085,10 @@ msgstr "Meldung anpassen" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2090,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "Monat" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Am meisten kommentiert" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2107,11 +2123,11 @@ msgstr "Am meisten kommentiert" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2120,7 +2136,7 @@ msgstr "Name" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Name:" @@ -2130,11 +2146,11 @@ msgstr "Name:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Zu dieser Meldung zoomen" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2146,7 +2162,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2170,11 +2186,11 @@ msgstr "Fast Fertig! Bitte checken Sie Ihre Mailbox…" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Neue Organisation hinzugefügt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "" @@ -2210,23 +2226,23 @@ msgstr "" msgid "New priority" msgstr "Neue Priorität" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2234,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2270,11 +2286,11 @@ msgstr "Neuer Status" msgid "New template" msgstr "Neue Vorlage" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Neueste" @@ -2286,10 +2302,10 @@ msgstr "Weiter" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2297,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Nein" @@ -2309,11 +2324,7 @@ msgstr "Nein" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "" @@ -2321,7 +2332,7 @@ msgstr "" msgid "No council selected" msgstr "" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Noch keine Antwort" @@ -2338,11 +2349,11 @@ msgstr "" msgid "No further updates" msgstr "Bearbeitung abschliessen" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2350,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2372,15 +2383,15 @@ msgstr "" msgid "None" msgstr "Keine" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2400,13 +2411,13 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "" @@ -2430,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2446,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "Alter Status" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Älteste" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2466,7 +2477,7 @@ msgstr "" msgid "Open" msgstr "Aufgenommen" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2474,7 +2485,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2506,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "" @@ -2541,8 +2552,8 @@ msgstr "Besitzer" msgid "Page Not Found" msgstr "" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Gehört zu" @@ -2556,19 +2567,19 @@ msgstr "" msgid "Password (optional)" msgstr "Passwort" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2588,17 +2599,16 @@ msgstr "Telefonnummer (optional)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefonnummer:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2609,6 +2619,7 @@ msgstr "Telefonnummer:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2623,7 +2634,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "Foto wird benötigt" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Foto benötigt" @@ -2652,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Pin auf der Karte absetzen" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Bitte seien Sie freundlich und prägnant." @@ -2673,7 +2688,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,11 +2696,11 @@ msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" @@ -2694,8 +2709,9 @@ msgstr "Bitte wählen Sie eine Kategorie" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2711,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,90 +2741,90 @@ msgstr "" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "Obligatorisches Feld" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Obligatorisches Feld" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Bitte geben Sie einige Details an" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Ihre E-Mail Adresse" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Namen an" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Obligatorisches Feld" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Bitte geben Sie Ihren Namen an" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Bitte geben Sie Ihre E-Mail-Adresse an" @@ -2836,7 +2852,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2862,11 +2878,11 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2902,16 +2918,16 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "" @@ -2947,12 +2963,12 @@ msgstr "" msgid "Previous" msgstr "Zurück" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2966,14 +2982,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Meldung" @@ -2996,7 +3016,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "" @@ -3004,7 +3024,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Meldungen" @@ -3029,7 +3049,7 @@ msgstr "Meldungen, welche kürzlich beantwortet wurden" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3054,8 +3074,8 @@ msgstr "Meldungen innerhalb %s, %s" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Meldung aktualisieren" @@ -3081,7 +3101,7 @@ msgstr "" msgid "Public response:" msgstr "Rückmeldung an User" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "Rückmeldung an User" @@ -3106,6 +3126,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -3129,11 +3150,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -3141,7 +3162,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3161,6 +3182,14 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3180,11 +3209,11 @@ msgstr "Kürzlich erfasste Meldungen, %s" msgid "Recently reported problems" msgstr "Kürzlich erfasste Meldungen:" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "Neueste Bearbeitung" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3196,7 +3225,7 @@ msgstr "«Züri wie neu» dient dazu Schäden an der Infrastrukt msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3210,9 +3239,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3238,20 +3267,20 @@ msgstr "Antwort an User" msgid "Report" msgstr "Meldung" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "Meldungs-ID" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Eine Meldung erfassen" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3261,7 +3290,7 @@ msgstr "" msgid "Report abuse" msgstr "Missbrauch melden" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3295,17 +3324,18 @@ msgid "Report, view, or discuss local problems" msgstr "Melden Sie Schäden an der Infrastruktur von Zürich" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -3349,28 +3379,28 @@ msgstr "Gemeldet" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Meldungen" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3382,7 +3412,7 @@ msgstr "Rückmeldung ausstehend" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3394,15 +3424,15 @@ msgstr "" msgid "Reports published" msgstr "Beantwortet" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3410,11 +3440,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "Ausstehender Meldungsversand" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3454,20 +3484,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "Vorlagen für %s" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Richtiger Ort?" @@ -3479,15 +3509,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3498,23 +3528,23 @@ msgstr "Rechts drehen" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Durch das Drehen des Fotos gehen nicht gespeicherte Änderungen verloren." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Speichern" @@ -3523,12 +3553,12 @@ msgstr "Speichern" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3538,7 +3568,8 @@ msgstr "" msgid "Search Reports" msgstr "Meldungen suchen" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "User suchen" @@ -3547,7 +3578,7 @@ msgid "Search reports" msgstr "Meldungen suchen" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Suchen:" @@ -3557,7 +3588,7 @@ msgstr "Suchen:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3573,17 +3604,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Organisation wählen" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Gebiet wählen" @@ -3603,15 +3635,15 @@ msgstr "" msgid "Select:" msgstr "Auswählen" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3620,7 +3652,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "Meldung zurückgewiesen" @@ -3647,7 +3679,7 @@ msgstr "Gerät" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3656,9 +3688,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3666,15 +3698,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3686,7 +3718,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "" @@ -3698,21 +3730,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Zeige Stecknadeln" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3755,8 +3787,8 @@ msgstr "Ausloggen" msgid "Some categories may require additional information." msgstr "Einige Kategorien benötigen eventuell zusätzliche Informationen." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3771,6 +3803,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3788,7 +3828,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3810,7 +3850,7 @@ msgstr "Diese Adresse wurde nicht gefunden." msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Ihre Bilder konnten nicht gespeichert werden. Bitte versuchen Sie es nochmals." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3820,15 +3860,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Sortieren nach" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3836,31 +3876,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3873,14 +3914,14 @@ msgstr "" msgid "State:" msgstr "Status" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3896,7 +3937,7 @@ msgid "Status" msgstr "" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3909,7 +3950,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3917,12 +3958,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "FB/Externe" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Titel" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Titel" @@ -3940,7 +3981,7 @@ msgstr "Abschicken" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3961,7 +4002,8 @@ msgstr "Erfasst" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -3969,21 +4011,29 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "Fassen Sie Ihre Änderungen zusammen" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4003,11 +4053,11 @@ msgstr "Alle Meldungen" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4025,8 +4075,8 @@ msgstr "" msgid "Template «%s»" msgstr "Vorlage «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4036,7 +4086,7 @@ msgstr "Vorlagen" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "" @@ -4080,7 +4130,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Sie können Schäden nur innerhalb der Stadt Zürich melden. Verwenden Sie dafür die Adressuche." @@ -4094,11 +4144,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Die Meldung wurde als gesendet markiert." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "" @@ -4110,53 +4160,53 @@ msgstr "Diese Meldung wurde von «Züri wie neu» entfernt." msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von «Züri wie neu» entfernt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4166,8 +4216,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4182,12 +4232,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Bitte machen Sie so genaue Angaben wie möglich: Beschreiben Sie die Art des Schadens und wo er sich befindet (z.B. an der Wand). Senden Sie uns mindestens ein Foto des Schadens (inkl. Umgebung).
Beschreiben Sie nur einen Schaden pro Meldung." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "" @@ -4233,7 +4283,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Der Link ist entweder abgelaufen, oder er wurde nicht korrekt kopiert." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4254,20 +4304,20 @@ msgstr "" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4279,7 +4329,11 @@ msgstr "Namen müssen nicht eindeutig sein." msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4287,8 +4341,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4310,7 +4364,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -4327,8 +4381,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4337,7 +4391,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4355,36 +4409,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -4401,7 +4454,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4417,12 +4474,16 @@ msgstr "Dieser Schaden wurde nicht behoben" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Überprüfung ausstehend" @@ -4443,7 +4504,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4454,7 +4515,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "Aufwand (in Minuten)" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4492,7 +4553,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4521,34 +4582,34 @@ msgstr "" msgid "Total" msgstr "Total" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "Vertrauenswürdig" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Erneut versuchen" @@ -4567,16 +4628,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4594,7 +4655,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Unbekannter Fehler" @@ -4607,7 +4668,7 @@ msgstr "Unbekannter Fehler" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4620,7 +4681,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Speichern" @@ -4629,16 +4690,16 @@ msgstr "Speichern" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Speichern" @@ -4663,7 +4724,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4681,14 +4742,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Aktualisiert!" @@ -4713,12 +4774,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "Änderungen an dieser Meldung, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4728,15 +4789,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4745,48 +4806,48 @@ msgstr "" msgid "Used map" msgstr "Karte verwendet" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Diese Suche sucht in den Namen der Benützer und deren E-Mail-Adressen." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4795,20 +4856,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4842,12 +4903,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Meldung erfassen" @@ -4882,7 +4943,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4897,8 +4958,8 @@ msgstr "Die ersten zehn Treffer werden unten aufgelistet." #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Ihre persönlichen Angaben werden nur für interne Zwecke verwendet und nicht veröffentlicht." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4912,8 +4973,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Wann editiert" @@ -4933,14 +4998,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4961,15 +5022,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unleserlich. Ebenso wenn keine Satzzeichen verwendet werden." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4978,20 +5043,19 @@ msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unle #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -4999,7 +5063,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5012,7 +5076,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Danke! Sie können Ihre aktualisierte Meldung auf der Webseite anschauen." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5020,7 +5084,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5038,15 +5102,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Nicht freigeschaltet; Bitte geben Sie eine Adresse an" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5112,7 +5176,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5134,9 +5198,10 @@ msgstr "Ihr Account" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "E-Mail Adresse" @@ -5152,10 +5217,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Wir verwenden Ihre persönlichen Daten nur entsprechend unserer Datenschutzrichtlinien." +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Ihr Name" @@ -5171,7 +5236,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5194,7 +5259,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -5219,7 +5284,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5236,25 +5301,24 @@ msgstr "" msgid "Yourself" msgstr "Sie selbst" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5288,8 +5352,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5298,12 +5362,12 @@ msgstr "" msgid "from %s different users" msgstr "von %s verschiedenen Personen" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "letzte Bearbeitung %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "weniger als einer Minute" @@ -5314,7 +5378,7 @@ msgid "n/a" msgstr "" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5354,7 +5418,7 @@ msgstr "Originaltext: “%s”" msgid "other areas:" msgstr "" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5362,7 +5426,7 @@ msgstr "" msgid "sign out" msgstr "ausloggen" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5379,19 +5443,19 @@ msgstr "Es wird keine Stecknadel angezeigt, da der User die Karte nicht benü msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "heute" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5407,11 +5471,11 @@ msgstr "" msgid "user is problem owner" msgstr "Der User ist der Eigner der Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5420,35 +5484,35 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5462,14 +5526,14 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d Woche" msgstr[1] "%d Wochen" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5539,7 +5603,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s Meldung bearbeitet" msgstr[1] "%s Meldungen bearbeitet" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5560,7 +5624,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po index 1da38ffbc46..9fa674b828b 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: German (Germany) (https://www.transifex.com/mysociety/teams/12067/de_DE/)\n" "Language: de_DE\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "und" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "und" msgid " or " msgstr "oder" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d bearbeitet von %s" @@ -48,7 +48,7 @@ msgstr "%d bearbeitet von %s" msgid "%d to %d of %d" msgstr "%d an %d von %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "" @@ -163,11 +163,11 @@ msgstr "" msgid "(optional)" msgstr "(optional)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(gesendet an beide)" @@ -176,13 +176,13 @@ msgstr "(gesendet an beide)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "--Wählen Sie eine Vorlage aus--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%s gespeichert." @@ -232,11 +232,11 @@ msgstr "" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "" @@ -291,8 +291,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Füge neue Kategorie hinzu" @@ -307,27 +307,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Benutzer hinzufügen" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -335,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "%s hinzugefügt" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "Alle Berichte zwischen %s und %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonym:" @@ -445,29 +448,29 @@ msgstr "Anonym:" msgid "Another user" msgstr "Anderer Benutzer" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Gebiet abgedeckt" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Gebiet:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -488,11 +491,11 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "" @@ -504,8 +507,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Wartet auf Moderation" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Zurück" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -554,10 +557,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -592,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "Kategorien" msgid "Categories:" msgstr "Kategorien:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "Kategorie" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "Passwort ändern" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -678,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -720,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,17 +773,17 @@ msgstr "" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Bestätigen" @@ -797,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "Bestätigung" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Bestätigt" @@ -829,7 +836,11 @@ msgstr "Kontaktieren Sie das Team" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -838,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinaten:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Benutzer konnte nicht gefunden werden" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "" @@ -851,9 +862,11 @@ msgstr "" msgid "Council" msgstr "Rat" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "" @@ -882,8 +895,8 @@ msgstr "Erfasse eine Meldung" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Kategorie erstellen" @@ -891,15 +904,15 @@ msgstr "Kategorie erstellen" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +926,7 @@ msgstr "Vorlage erstellen" msgid "Created" msgstr "Erstellt" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -936,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -969,32 +982,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Vorlage löschen" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Gelöscht" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1010,18 +1023,18 @@ msgstr "Beschreibung" msgid "Description:" msgstr "Beschreibung:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Beschreibung" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1032,7 +1045,7 @@ msgstr "Beschreibung:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -1041,24 +1054,24 @@ msgstr "" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Weiss ich nicht" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "Änderungen verwerfen" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1067,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "Haben Sie ein %s-Passwort?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "Weiß ich nicht" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Sie mögen keine Formulare?" @@ -1083,19 +1096,19 @@ msgstr "Sie mögen keine Formulare?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1103,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1112,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Bearbeiten" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1136,15 +1149,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1167,28 +1180,28 @@ msgstr "Problem %d wird bearbeitet" msgid "Editing update %d" msgstr "Aktualisierung %d wird bearbeitet" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Benutzer %d wird bearbeitet" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Editor" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-Mail" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1217,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "E-Mail:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1255,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1264,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1281,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Endpunkt" @@ -1303,10 +1316,6 @@ msgstr "Geben Sie eine Adresse an" msgid "Enter a nearby street name and area" msgstr "Geben Sie eine Adresse an" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Beschreiben sie den Mangel" @@ -1320,13 +1329,13 @@ msgstr "Beschreiben sie den Mangel" msgid "Error" msgstr "Fehler" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Alles" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Beispieladresse" @@ -1338,11 +1347,11 @@ msgstr "Beispiele:" msgid "Existing category" msgstr "Vorhandene Kategorie" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1359,7 +1368,7 @@ msgstr "Als CSV exportieren" msgid "External ID" msgstr "Externe Kennung" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "Externe URL" @@ -1380,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Zusätzliche Daten:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1421,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "Berichtliste filtern" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Erstes Mal" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1445,9 +1455,9 @@ msgstr "" msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "" @@ -1455,8 +1465,8 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "" @@ -1464,7 +1474,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1473,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "" @@ -1489,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1503,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Passwort vergessen?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1523,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Aktualisierungen holen" @@ -1553,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1565,7 +1577,7 @@ msgstr "Los" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1624,11 +1636,11 @@ msgstr "Unsichtbar" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1649,9 +1661,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Stecknadeln ausblenden" @@ -1668,11 +1680,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "History" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "" @@ -1680,7 +1692,7 @@ msgstr "" msgid "How to report a problem" msgstr "Erfasse eine neue Meldung:" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "" @@ -1702,7 +1714,7 @@ msgstr "" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1711,8 +1723,8 @@ msgstr "" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1734,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1752,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1779,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Unbekannt ID" @@ -1814,7 +1830,7 @@ msgstr "Unbekannt ID" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1826,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1842,15 +1858,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1858,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "Interne Hinweise" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1866,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Ungültiges Format %s angegeben." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1892,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1905,8 +1921,8 @@ msgstr "" msgid "Last 7 days" msgstr "Letzte 7 Tage" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Letzter Bearbeiter" @@ -1922,17 +1938,17 @@ msgstr "Letzte Bearbeitung" msgid "Last update:" msgstr "Letzte Aktualisierung:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "Breitengrad/Längengrad:" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1940,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Liste aller Meldungen" @@ -1984,16 +2000,16 @@ msgstr "Mit Facebook anmelden" msgid "Log in with Twitter" msgstr "Mit Twitter anmelden" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Mit E-Mail anmelden" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2001,23 +2017,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "KARTE" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Karte" @@ -2025,15 +2041,15 @@ msgstr "Karte" msgid "Mark as sent" msgstr "Als gesendet markieren" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Nachricht" @@ -2049,19 +2065,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Fehlendes jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2069,10 +2085,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2090,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "Monat" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Meistkommentiert" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2107,11 +2123,11 @@ msgstr "Meistkommentiert" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2120,7 +2136,7 @@ msgstr "Name" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Name:" @@ -2130,11 +2146,11 @@ msgstr "Name:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2146,7 +2162,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2170,11 +2186,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "" @@ -2210,23 +2226,23 @@ msgstr "" msgid "New priority" msgstr "Neue Priorität" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2234,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2270,11 +2286,11 @@ msgstr "Neuer Status" msgid "New template" msgstr "Neue Vorlage" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Neueste" @@ -2286,10 +2302,10 @@ msgstr "Weiter" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2297,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Nein" @@ -2309,11 +2324,7 @@ msgstr "Nein" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Kein Gebiet" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "" @@ -2321,7 +2332,7 @@ msgstr "" msgid "No council selected" msgstr "Kein Rat ausgewählt" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Noch keine Antwort" @@ -2338,11 +2349,11 @@ msgstr "" msgid "No further updates" msgstr "Keine weiteren Aktualisierungen" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2350,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Kein Ergebnis zurückgegeben" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2372,15 +2383,15 @@ msgstr "Keine Unterstützer" msgid "None" msgstr "Keine" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2400,13 +2411,13 @@ msgstr "Nicht vorher berichtet" msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Anmerkung" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Anmerkung:" @@ -2430,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2446,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "Alter Status" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Älteste" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2466,7 +2477,7 @@ msgstr "" msgid "Open" msgstr "Öffnen" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "Open311 API-Schlüssel" @@ -2474,7 +2485,7 @@ msgstr "Open311 API-Schlüssel" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2506,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Andere" @@ -2541,8 +2552,8 @@ msgstr "Besitzer" msgid "Page Not Found" msgstr "Seite nicht gefunden" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Übergeordnet" @@ -2556,19 +2567,19 @@ msgstr "Teilweise" msgid "Password (optional)" msgstr "Passwort (optional)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Berechtigungen:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2588,17 +2599,16 @@ msgstr "Telefonnummer (optional)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefonnummer:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2609,6 +2619,7 @@ msgstr "Telefonnummer:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2623,7 +2634,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "Foto ist erforderlich." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Foto erforderlich" @@ -2652,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Stecknadel auf Karte platzieren" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Bitte seien Sie freundlich und prägnant." @@ -2673,7 +2688,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre eMail-Adresse korrekt ist" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,11 +2696,11 @@ msgstr "Bitte überprüfen Sie ob Ihre eMail-Adresse korrekt ist" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" @@ -2694,8 +2709,9 @@ msgstr "Bitte wählen Sie eine Kategorie" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Bitte korrigieren Sie die Fehler unten" @@ -2711,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Bitte geben Sie eine Nachricht ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,90 +2741,90 @@ msgstr "Bitte geben Sie eine Nachricht ein" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Bitte geben Sie Ihren Namen ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Bitte geben Sie ein Passwort ein" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Bitte geben Sie einen Betreff ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Bitte geben Sie eine gültige eMail-Adresse an" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige eMail-Adresse an" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Bitte geben Sie einiges Details an" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Bitte geben Sie Ihre eMail-Adresse an" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Vornamen ein" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Bitte geben Sie Ihre Telefonnummer ein" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Bitte geben Sie Ihren zweiten Vornamen ein" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Bitte geben Sie Ihren Titel ein" @@ -2836,7 +2852,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2862,11 +2878,11 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2902,16 +2918,16 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Bitte schreiben Sie eine Nachricht" @@ -2947,12 +2963,12 @@ msgstr "" msgid "Previous" msgstr "Vorherige" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "Prioritäten" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "Priorität" @@ -2966,14 +2982,18 @@ msgstr "Datenschutz" msgid "Privacy and cookies" msgstr "Datenschutz und Cookies" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privat" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Meldung" @@ -2996,7 +3016,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problem als offen markiert." @@ -3004,7 +3024,7 @@ msgstr "Problem als offen markiert." msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Meldungen" @@ -3029,7 +3049,7 @@ msgstr "Meldungen, welche kürzlich gelöst wurden" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3054,8 +3074,8 @@ msgstr "" msgid "Property address:" msgstr "Immobilien-Adresse:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Meldung aktualisieren" @@ -3081,7 +3101,7 @@ msgstr "Öffentliche Details" msgid "Public response:" msgstr "Öffentliche Antwort:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "Öffentliche Aktualisierung:" @@ -3106,6 +3126,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -3129,11 +3150,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -3141,7 +3162,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3161,6 +3182,14 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3180,11 +3209,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Kürzlich erfasste Meldungen" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3196,7 +3225,7 @@ msgstr "Fix My Zürich wird primär dafür verwendet, physische M&au msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3210,9 +3239,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3238,20 +3267,20 @@ msgstr "" msgid "Report" msgstr "Bericht" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Eine Meldung erfassen" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3261,7 +3290,7 @@ msgstr "" msgid "Report abuse" msgstr "Missbrauch melden" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3295,17 +3324,18 @@ msgid "Report, view, or discuss local problems" msgstr "Melden sie Mängel an der Infrastruktur von Zürich" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Vorher berichtet" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -3349,28 +3379,28 @@ msgstr "Gemeldet:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Verfassen Sie eine Meldung" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Berichte" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3382,7 +3412,7 @@ msgstr "Berichte warten auf Moderation" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3394,15 +3424,15 @@ msgstr "" msgid "Reports published" msgstr "Berichte veröffentlicht" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3410,11 +3440,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3454,20 +3484,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Richtiger Ort?" @@ -3479,15 +3509,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Nach links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3498,23 +3528,23 @@ msgstr "Nach rechts drehen" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satellit" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Änderungen speichern" @@ -3523,12 +3553,12 @@ msgstr "Änderungen speichern" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3538,7 +3568,8 @@ msgstr "" msgid "Search Reports" msgstr "Berichte suchen" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Benutzer suchen" @@ -3547,7 +3578,7 @@ msgid "Search reports" msgstr "Berichte suchen" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Suchen:" @@ -3557,7 +3588,7 @@ msgstr "Suchen:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3573,17 +3604,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Wählen Sie ein Gebiet" @@ -3603,15 +3635,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3620,7 +3652,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3647,7 +3679,7 @@ msgstr "Dienst:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3656,9 +3688,9 @@ msgid "Share" msgstr "Teilen" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3666,15 +3698,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3686,7 +3718,7 @@ msgstr "Foto anzeigen?" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Meinen Namen öffentlich anzeigen" @@ -3698,21 +3730,21 @@ msgstr "Name öffentlich anzeigen?" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "Foto anzeigen" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Zeige Stecknadeln" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3755,8 +3787,8 @@ msgstr "Abmelden" msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3771,6 +3803,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3788,7 +3828,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3810,7 +3850,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3820,15 +3860,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3836,31 +3876,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3873,14 +3914,14 @@ msgstr "" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3896,7 +3937,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3909,7 +3950,7 @@ msgstr "Straßenansicht" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3917,12 +3958,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Titel" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Titel:" @@ -3940,7 +3981,7 @@ msgstr "Abschicken" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3961,7 +4002,8 @@ msgstr "Gesendet" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Abonnieren" @@ -3969,21 +4011,29 @@ msgstr "Abonnieren" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4003,11 +4053,11 @@ msgstr "Zusammenfassungsberichte" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4025,8 +4075,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4036,7 +4086,7 @@ msgstr "Vorlagen" msgid "Text" msgstr "Text" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Nur-Text-Version" @@ -4080,7 +4130,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4094,11 +4144,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Das Problem wird jetzt erneut gesendet." @@ -4110,53 +4160,53 @@ msgstr "Dieser Bericht kann nicht auf %s angeschaut werden." msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von Fix My Zürich entfernt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4166,8 +4216,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4182,12 +4232,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Der Fehler war: %s" @@ -4233,7 +4283,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4254,20 +4304,20 @@ msgstr "" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4279,7 +4329,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4287,8 +4341,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4310,7 +4364,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Es gab ein Problem mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Es gab ein Problem mit Ihrem Bericht. Bitte versuchen Sie es erneut." @@ -4327,8 +4381,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4337,7 +4391,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4355,36 +4409,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -4401,7 +4454,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4417,12 +4474,16 @@ msgstr "Dieser Mangel wurde nicht behoben" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Dieser Bericht wartet auf Moderation." @@ -4443,7 +4504,7 @@ msgstr "Dieser Bericht ist aktuell als offen markiert." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4454,7 +4515,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zeitleiste" @@ -4492,7 +4553,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4521,34 +4582,34 @@ msgstr "" msgid "Total" msgstr "Total" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Erneut versuchen" @@ -4567,16 +4628,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4594,7 +4655,7 @@ msgstr "Unbekannter Benachrichtigungstyp" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Unbekannter Fehler" @@ -4607,7 +4668,7 @@ msgstr "Unbekannter Fehler" msgid "Unknown problem ID" msgstr "Unbekannte Problemkennung" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4620,7 +4681,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Beschreibung" @@ -4629,16 +4690,16 @@ msgstr "Beschreibung" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4663,7 +4724,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4681,14 +4742,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Aktualisiert!" @@ -4713,12 +4774,12 @@ msgstr "Aktualisierungen auf {{title}}" msgid "Updates to this problem, %s" msgstr "Aktualisierungen für dieses Problem, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4728,15 +4789,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4745,48 +4806,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4795,20 +4856,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Benutzer" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Werte aktualisiert" @@ -4842,12 +4903,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4882,7 +4943,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4897,7 +4958,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4912,8 +4973,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Wann editiert" @@ -4933,14 +4998,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4961,15 +5022,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unleserlich. Ebenso wenn keine Satzzeichen verwendet werden." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4978,20 +5043,19 @@ msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unle #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -4999,7 +5063,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5012,7 +5076,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5020,7 +5084,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5038,15 +5102,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5112,7 +5176,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5134,9 +5198,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Ihre eMail" @@ -5152,10 +5217,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Ihr Name" @@ -5171,7 +5236,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5194,7 +5259,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -5219,7 +5284,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5236,25 +5301,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "alle" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5288,8 +5352,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "Benutzer bearbeiten" @@ -5298,12 +5362,12 @@ msgstr "Benutzer bearbeiten" msgid "from %s different users" msgstr "von %s verschiedenen Benutzern" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "zuletzt aktualisiert %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "weniger als einer Minute" @@ -5314,7 +5378,7 @@ msgid "n/a" msgstr "n/v" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "keine" @@ -5354,7 +5418,7 @@ msgstr "" msgid "other areas:" msgstr "andere Gebiete:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5362,7 +5426,7 @@ msgstr "" msgid "sign out" msgstr "ausloggen" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5379,19 +5443,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "heute" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5407,11 +5471,11 @@ msgstr "" msgid "user is problem owner" msgstr "Benutzer ist Problemeigentümer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5420,35 +5484,35 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Tag" msgstr[1] "%d Tage" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stunde" msgstr[1] "%d Stunden" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minute" msgstr[1] "%d Minuten" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5462,14 +5526,14 @@ msgid_plural "%d supporters" msgstr[0] "%d Unterstützer" msgstr[1] "%d Unterstützer" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d Woche" msgstr[1] "%d Wochen" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5539,7 +5603,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s Meldung bearbeitet" msgstr[1] "%s Meldungen bearbeitet" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5560,7 +5624,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po index 3feaab49206..87a5ddda58e 100644 --- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Greek (Greece) (https://www.transifex.com/mysociety/teams/12067/el_GR/)\n" "Language: el_GR\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "και" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "και" msgid " or " msgstr "ή" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d επεξεργασίες από "%s"" @@ -48,7 +48,7 @@ msgstr "%d επεξεργασίες από "%s"" msgid "%d to %d of %d" msgstr "%d μέχρι %d από %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -162,7 +162,7 @@ msgstr "(όπως graffiti, παρατημένα σκουπίδια, σπασμ msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(δεν αποστάλθηκε σε υπηρεσία)" @@ -171,11 +171,11 @@ msgstr "(δεν αποστάλθηκε σε υπηρεσία)" msgid "(optional)" msgstr "(προαιρετικό)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(στάλθηκε και στις δύο)" @@ -184,13 +184,13 @@ msgstr "(στάλθηκε και στις δύο)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Διάλεξε κατηγορία --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -198,8 +198,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -214,11 +214,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "

Αναφορές, Στατιστικά και Ενέργειες για

%s

" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr " %s αναφορές %s" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%s αποθηκεύτηκε." @@ -243,11 +243,11 @@ msgstr "Όχι Να γίνει επιβεβαίωση της ε msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Σημείωση: Η αναφορά έχει δρομολογηθεί προς ενέργεια. Για οποιαδήποτε μεταβολή συμβεί δεν θα ενημερωθεί αυτόματα." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Σημείωση: Η αναφορά δεν έχει δρομολογηθεί ακόμα προς ενέργεια. Οποιαδήποτε μεταβολή μπορεί να μην ενηρωθεί." @@ -267,8 +267,8 @@ msgstr "Έλεγχος ταυτότητας δύο παραγόντων" msgid "Add" msgstr "Προσθήκη" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -277,13 +277,13 @@ msgstr "" "Πρόσθεσε έναν τομέα για κάθε υπηρεσία, όπως για παράδειγμα μια υπηρεσία ή τμήμα\n" "στο οποίο θα μπορούν να στέλνονται οι αναφορές προβλημάτων. Μπορείς να προσθέσεις μία ή περισσότερες επαφές (για διαφορετικές κατηγορίες προβλημάτων) στον κάθε τομέα." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Πρόσθεσε μία επαφή χρησιμοποιώντας την παρακάτω φόρμα." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Προσθήκη τομέα" @@ -304,8 +304,8 @@ msgstr "Προσθήκη πεδίου" msgid "Add fixed state" msgstr "Προσθήκη σταθερής κατάστασης" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Προσθήκη νέας κατηγορίας" @@ -320,27 +320,27 @@ msgstr "Προσθήκη αρ. τηλεφώνου" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Προσθήκη στoν κατάλογο" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Προσθήκη χρήστη" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -348,7 +348,7 @@ msgstr "" msgid "Added %s" msgstr "Προστέθηκε %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -377,7 +377,6 @@ msgstr "Ειδοποίησέ με για μελλοντικές ενημερώσ msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -424,11 +423,15 @@ msgstr "Όλες οι αναφορές από %s μέχρι %s" msgid "All time" msgstr "Όλες τις ώρες" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "Εναλλακτικά, μπορεί να αποκρυφθεί το όνομα σου απόόλες αναφορές και ενημερώσεις σε όλη την ιστοσελίδα:" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "Πάντα ανάκτηση του συνόλου των προβλημάτων" @@ -447,9 +450,9 @@ msgid "Anonymous user" msgstr "Ανώνυμος χρήστης" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Ανώνυμος:" @@ -458,29 +461,29 @@ msgstr "Ανώνυμος:" msgid "Another user" msgstr "Άλλος χρήστης" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Είστε σίγουροι πως θέλετε να ακυρώσετε αυτή την μεταφόρτωση;" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Είσαι σίγουρος?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Περιοχή αρμοδιότητας" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Περιοχή:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Δεδομένου ότι αυτό είναι ένα δοκιμαστικό site και το %s είναι ψευδές, οι αναφορές που γίνονται σε αυτό το site θα σταλούν στις δοκιμαστικές αναφορές προβλημάτων και όχι στην κανονική επαφή που υπάρχει για την κατηγορία αναφοράς των προβλημάτων." @@ -501,11 +504,11 @@ msgstr "Ανάθεση σε εξωτερικό τομέα:" msgid "Assign to subdivision:" msgstr "Ανάθεση στο τμήμα:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Ανατέθηκε στο "%s"" @@ -517,8 +520,8 @@ msgstr "Σε κάθε αναζήτηση επιστρέφονται το πολ msgid "At the moment only searching for and looking at reports work." msgstr "Αυτή τη στιγμή λειτουργούν μόνο η αναζήτηση και η προβολή αναφορών." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -534,7 +537,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -555,11 +558,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Σε αναμονή ελέγχου" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Πίσω" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -567,10 +570,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -579,17 +582,17 @@ msgstr "Τομείς" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Τομέας" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Τομέας:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -605,7 +608,7 @@ msgstr "Δεν μπορείς να βρεις το email μας; Έλεγξε τ msgid "Can't see the map? Skip this step" msgstr "Δεν μπορείς να δεις τον χάρτη; Παράλειψη βήματος" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -616,15 +619,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -637,7 +640,7 @@ msgstr "Κατηγορία" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -647,9 +650,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Μέσος όρος διόρθωσης προβλημάτων για την κατηγορία > 4 εβδομάδες" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -676,11 +679,11 @@ msgstr "Αλλαγή κωδικού πρόσβασης" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -696,17 +699,17 @@ msgstr "" "
\n" "Αυτό είναι κατάλληλο για ζητήματα που θέλεις να επιτρέψεις σε χρήστες να υποβάλλουν αναφορές στον τομέα, αλλά για τα οποία δεν χρειάζεται η αναφορά να είναι δημόσια. Ένα τέτοιο παράδειγμα είναι αν κάποιος θέλει να ζητήσει έναν επιπλέον κάδο απορριμάτων σε συγκεκριμένη διεύθυνση." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Επίλεξε ένα όνομα κατηγορίας που να έχει νόημα για τους πολίτες (π.χ., \"Λακκούβες\", \"Φωτισμός δρόμων\") αλλά είναι χρήσιμο και για τον τομέα. Αυτά θα φαίνονται στο μενού της σελίδας \"Ανάφερε ένα πρόβλημα\"." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -738,9 +741,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -784,17 +791,17 @@ msgstr "Προστεθέν σήμα:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Ρυθμίσεις" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Επιβεβαίωση" @@ -815,9 +822,9 @@ msgstr "Κάνε επιβεβαίωση μέσω email παρακάτω, εισ msgid "Confirmation" msgstr "Επιβεβαίωση" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Επιβεβαιώθηκε" @@ -847,7 +854,11 @@ msgstr "Επικοινώνησε με την ομάδα διαχείρισης" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -856,12 +867,12 @@ msgstr "" msgid "Coordinates:" msgstr "Συντεταγμένες:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Δεν είναι δυνατή η εύρεση χρήστη" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Δεν είναι δυνατή η εύρεση της τοποθεσίας" @@ -869,9 +880,11 @@ msgstr "Δεν είναι δυνατή η εύρεση της τοποθεσία msgid "Council" msgstr "Υπηρεσία" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Επαφές υπηρεσίας για "%s"" @@ -900,8 +913,8 @@ msgstr "Δημιουργία αναφοράς" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Δημιουργία κατηγορίας" @@ -909,15 +922,15 @@ msgstr "Δημιουργία κατηγορίας" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -931,7 +944,7 @@ msgstr "Δημιουργία προτύπου" msgid "Created" msgstr "Δημιουργήθηκε" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -954,12 +967,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Δεν έχουν δημιουργηθεί τομείς μέχρι στιγμής." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Δεν υπάρχει τρόπος επικοινωνίας με τον πελάτη" @@ -987,32 +1000,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Διαγραφή προτύπου" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Διαγραμμένα" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1028,18 +1041,18 @@ msgstr "Περιγραφή" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Πληροφορίες" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1050,7 +1063,7 @@ msgstr "Πληροφορίες:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Μεταβιβάστηκε" @@ -1059,24 +1072,24 @@ msgstr "Μεταβιβάστηκε" msgid "Didn't use map" msgstr "Δεν χρησιμοποιήθηκε ο χάρτης" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Πίνακας βραβείων επιμέλειας" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1085,7 +1098,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "Έχεις κωδικό πρόσβασης %s?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1093,7 +1106,7 @@ msgstr "" msgid "Don’t know" msgstr "Δεν γνωρίζω" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Δεν σου αρέσουν οι φόρμες;" @@ -1101,19 +1114,19 @@ msgstr "Δεν σου αρέσουν οι φόρμες;" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Σύρε φωτογραφίες εδώ ή κάνε κλικ για ανέβασμα" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1124,8 +1137,8 @@ msgstr "" "Διαφορετικές κατηγορίες μπορούν να ανήκουν στην ίδια επαφή (διεύθυνση email).\n" "Αυτό σημαίνει ότι μπορείς να προσθέσεις πολλές κατηγορίες ακόμη και αν έχεις μία επαφή στον τομέα." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1133,23 +1146,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Επεξεργασία" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Επεξεργασία λεπτομερειών του τομέα" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1157,15 +1170,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1188,28 +1201,28 @@ msgstr "Γίνεται επεξεργασία του προβλήματος %d" msgid "Editing update %d" msgstr "Γίνεται επεξεργασία της ενημέρωσης %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Γίνεται επεξεργασία του χρήστη %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Επεξεργαστής" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1238,37 +1251,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Email:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1276,8 +1289,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1289,8 +1302,8 @@ msgstr "" "Για περισσότερες πληροφορίες δες\n" "αυτό το άρθρο." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1300,8 +1313,8 @@ msgstr "" "διαφορετικό τελικό σημείο - endpoint - (και μέθοδο αποστολής) από αυτό του τομέα. Για παράδειγμα, όταν οι αναφορές από κάποια κατηγορία\n" "προβλημάτων πρέπει να σταλούν με email, ενώ κάποιες άλλες μπορούν να σταλούν με το Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1309,7 +1322,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Σημείο τερματισμού" @@ -1331,10 +1344,6 @@ msgstr "Γράψε έναν κοντινό ταχυδρομικό κώδικα, msgid "Enter a nearby street name and area" msgstr "Γράψε μία κοντινή οδό ή περιοχή" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Γράψε λεπτομέρειες σχετικά με το πρόβλημα" @@ -1348,13 +1357,13 @@ msgstr "Γράψε λεπτομέρειες σχετικά με το πρόβλ msgid "Error" msgstr "Σφάλμα" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Τα πάντα" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Παράδειγμα ταχυδρομικού κώδικα %s" @@ -1366,11 +1375,11 @@ msgstr "Παραδείγματα:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1387,7 +1396,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "Εξωτερικός Σύνδεσμος" @@ -1408,25 +1417,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Επιπλέον δεδομένα:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1449,11 +1458,12 @@ msgstr "" msgid "Filter report list" msgstr "Φίλτρο λίστας αναφοράς" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Πρώτη φορά" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Διόρθωσέ το επιλέγοντας μία περιοχή αρμοδιότητας στη φόρμα Επεξεργασία λεπτομερειών του σώματος παρακάτω." @@ -1473,9 +1483,9 @@ msgstr "Διορθώθηκε - Υπηρεσία" msgid "Fixed - User" msgstr "Διορθώθηκε - Χρήστης" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Σήμανση ως διαγραμμένο" @@ -1483,8 +1493,8 @@ msgstr "Σήμανση ως διαγραμμένο" msgid "Flag user" msgstr "Επισήμανση χρήστη" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Επισημασμένα" @@ -1492,7 +1502,7 @@ msgstr "Επισημασμένα" msgid "Flagged reports and users" msgstr "Επισημασμένες αναφορές και χρήστες" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Οι επισημασμένοι χρήστες καταγράφονται στη σελίδα επισημασμένων." @@ -1501,7 +1511,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Οι επισημασμένοι χρήστες δεν υφίστανται κάποιο είδος περιορισμού. Είναι απλά μία λίστα από χρήστες που έχουν επισημανθεί ώστε να ξεχωρίζουν." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Επισημασμένοι:" @@ -1517,7 +1527,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Για περισσότερες πληροφορίες, δες Πώς το FixMyStreet χρησιμοποιεί το Mapit (στα Αγγλικά)." @@ -1531,11 +1541,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Ξέχασες τον κωδικό πρόσβασής σου;" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Προωθήθηκε στον εξωτερικό τομέα" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "Η επιθυμία προωθήθηκε στον εξωτερικό τομέα" @@ -1551,6 +1561,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Λήψη ενημερώσεων" @@ -1581,9 +1593,9 @@ msgstr "Χαιρόμαστε που φτιάχτηκε!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1593,7 +1605,7 @@ msgstr "Εμπρός" msgid "Going to send questionnaire?" msgstr "Σκοπεύεις να στείλεις ερωτηματολόγιο;" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1601,7 +1613,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Γράφημα της δημιουργίας προβλημάτων (κατάσταση προς χρόνος)" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1652,11 +1664,11 @@ msgstr "Κρυμμένα" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1677,9 +1689,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Απόκρυψη καρφιτσών" @@ -1696,11 +1708,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Ιστορικό" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Αρχική" @@ -1708,7 +1720,7 @@ msgstr "Αρχική" msgid "How to report a problem" msgstr "Πώς να αναφέρεις ένα πρόβλημα" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Πώς να στείλεις επιτυχημένες αναφορές" @@ -1730,7 +1742,7 @@ msgstr "Δεν μπορέσαμε να εντοπίσουμε το πρόβλη #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1739,8 +1751,8 @@ msgstr "Δεν μπορέσαμε να εντοπίσουμε το πρόβλη msgid "ID" msgstr "Ταυτότητα" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1764,13 +1776,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Αν δύο ή περισσότεροι τομείς υπηρετούν την ίδια περιοχή, το FixMyStreet συνδυάζει τις ίδιες κατηγορίες σε μία ενιαία καταχώριση στο μενού. Αν θες να χρησιμοποιήσεις αυτή τη δυνατότητα, βεβαιώσου ότι σε κάθε τομέα το όνομα της συγκεκριμένης κατηγορίας είναι ίδιο." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1782,6 +1794,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Αν μάθεις περισσότερες πληροφορίες για την κατάσταση του προβλήματός σου, σε παρακαλούμε να επιστρέψεις στην ιστοσελίδα και να γράψεις μια σχετική ενημέρωση." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1809,34 +1825,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "Αν επιθυμείς να αφήσεις μία δημόσια ενημέρωση για το πρόβλημα, παρακαλούμε γράψ' την εδώ (σημείωση: δεν θα αποσταλεί στην υπηρεσία)." -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Αν χρησιμοποιείς κάποια μέθοδο αποστολής εκτός από email, γράψε το ID της υπηρεσίας (Open311) ή κάποιο ισοδύναμο ID εδώ." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Λανθασμένη ID" @@ -1844,7 +1860,7 @@ msgstr "Λανθασμένη ID" msgid "Illegal feed selection" msgstr "Λανθασμένη επιλογή ροής" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1856,7 +1872,7 @@ msgstr "Βρίσκεται στον πίνακα καταχρήσεων;" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Επιπλέον, θα επιστραφούν οι παρακάτω ιδιότητες που δεν περιλαμβάνονται στις προδιαγραφές του Open311 v2: agency_sent_datetime, title (επιστρέφεται επίσης ως μέρος της περιγραφής), interface_used, comment_count, requestor_name (υπάρχει μόνο εφόσον ο αιτών επιτρέψει την εμφάνιση του ονόματός του στην ιστοσελίδα)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1872,15 +1888,15 @@ msgstr "Να περιλαμβάνονται οι προσωπικές πληρο msgid "Incorrect has_photo value \"%s\"" msgstr "Εσφαλμένη τιμή has_photo \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1888,7 +1904,7 @@ msgstr "" msgid "Internal notes" msgstr "Εσωτερικές οδηγίες" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1896,12 +1912,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Εσφαλμένη τιμή agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Λανθασμένη μορφοποίηση %s." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1922,7 +1938,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1935,8 +1951,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Τελευταίος επεξεργαστής" @@ -1952,17 +1968,17 @@ msgstr "Τελευταία ενημέρωση" msgid "Last update:" msgstr "Τελευταία ενημέρωση:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Άφησέ το κενό αν όλες οι αναφορές σε αυτόν τον τομέα πρέπει να στέλνονται με την ίδια μέθοδο αποστολής (π.χ., \"%s\")." @@ -1970,7 +1986,7 @@ msgstr "Άφησέ το κενό αν όλες οι αναφορές σε αυτ msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Λίστα όλων των αναφερθέντων προβλημάτων" @@ -2014,16 +2030,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2031,23 +2047,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "ΧΑΡΤΗΣ" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Χάρτης" @@ -2055,15 +2071,15 @@ msgstr "Χάρτης" msgid "Mark as sent" msgstr "Σημείωση ως απεσταλμένο" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Να επισημάνεις ως επισημασμένους τους χρήστες των οποίων τη συμπεριφορά θα ήθελες να παρακολουθείς." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Μήνυμα" @@ -2079,19 +2095,19 @@ msgstr "Μήνυμα προς τον εξωτερικό τομέα:" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Λείπει το jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2099,10 +2115,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2120,12 +2136,12 @@ msgstr "" msgid "Month" msgstr "Μήνας" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2137,11 +2153,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2150,7 +2166,7 @@ msgstr "Όνομα" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Όνομα:" @@ -2160,11 +2176,11 @@ msgstr "Όνομα:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2176,7 +2192,7 @@ msgstr "Η οδός που βρίσκεται πλησιέστερα στην κ msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ο ταχυδρομικός κώδικας που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα): %s (%sm μακριά)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Η οδός που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα από το Bing Maps): %s" @@ -2202,11 +2218,11 @@ msgstr "Σχεδόν τελειώσαμε! Τώρα έλεγξε το email σο msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Προστέθηκε νέος τομέας" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Προστέθηκε νέα επαφή κατηγορίας" @@ -2242,23 +2258,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2266,7 +2282,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Νέα προβλήματα για το {{COUNCIL}} στην περιοχή {{WARD}} στο FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2302,11 +2318,11 @@ msgstr "Νέα κατάσταση" msgid "New template" msgstr "Νέο πρότυπο" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2318,10 +2334,10 @@ msgstr "Επόμενο" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2329,11 +2345,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Όχι" @@ -2341,11 +2356,7 @@ msgstr "Όχι" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Κανένας τομέας" @@ -2353,7 +2364,7 @@ msgstr "Κανένας τομέας" msgid "No council selected" msgstr "Δεν επιλέχθηκε κάποια υπηρεσία" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Δεν έχει γίνει καμία επεξεργασία." @@ -2370,11 +2381,11 @@ msgstr "Δε βρέθηκαν επισημασμένοι χρήστες." msgid "No further updates" msgstr "Καμία περαιτέρω ενημέρωση" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2382,12 +2393,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Δεν επιστράφηκαν αποτελέσματα." -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2404,15 +2415,15 @@ msgstr "Δεν υπάρχουν υποστηρικτές" msgid "None" msgstr "Κανένα" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2435,13 +2446,13 @@ msgstr "Δεν αναφέρθηκε στο παρελθόν" msgid "Not reported to council" msgstr "Δεν αναφέρθηκε σε υπηρεσία" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Σημείωση" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Σημείωση:" @@ -2465,15 +2476,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "ΟΚ" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2481,16 +2492,16 @@ msgstr "" msgid "Old state" msgstr "Παλιά κατάσταση" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2501,7 +2512,7 @@ msgstr "" msgid "Open" msgstr "Ανοιχτό" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2509,7 +2520,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API για τον server του mySociety FixMyStreet" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2541,17 +2552,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Άλλα" @@ -2576,8 +2587,8 @@ msgstr "Ιδιοκτήτης" msgid "Page Not Found" msgstr "Η σελίδα δεν βρέθηκε" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Πηγή" @@ -2591,19 +2602,19 @@ msgstr "Εν μέρει" msgid "Password (optional)" msgstr "Κωδικός πρόσβασης (προαιρετικό)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Σύνδεσμος" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2623,17 +2634,16 @@ msgstr "Αριθμός τηλεφώνου (προαιρετικό)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Τηλέφωνο:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2644,6 +2654,7 @@ msgstr "Τηλέφωνο:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2658,7 +2669,7 @@ msgstr "Φωτογραφία" msgid "Photo is required." msgstr "Απαιτείται φωτογραφία." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Απαιτείται φωτογραφία" @@ -2687,11 +2698,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Θέση της περιοχής στο χάρτη" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Παρακαλούμε να είσαι ευγενικός, συνοπτικός και στο θέμα." @@ -2708,7 +2723,7 @@ msgstr "Παρακαλούμε έλεγξε τους κωδικούς πρόσβ msgid "Please check your email address is correct" msgstr "Παρακαλούμε έλεγξε αν η διεύθυνση email είναι σωστή" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2716,11 +2731,11 @@ msgstr "Παρακαλούμε έλεγξε αν η διεύθυνση email ε msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Παρακαλούμε επίλεξε μια κατηγορία" @@ -2729,8 +2744,9 @@ msgstr "Παρακαλούμε επίλεξε μια κατηγορία" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Παρακαλούμε διόρθωσε τα παρακάτω λάθη" @@ -2749,13 +2765,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Παρακαλούμε να μην κάνεις κατάχρηση — η κατάχρηση της υπηρεσίας υποβαθμίζει την αξία της για όλους τους χρήστες." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Παρακαλούμε γράψε ένα μήνυμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2763,90 +2779,90 @@ msgstr "Παρακαλούμε γράψε ένα μήνυμα" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Παρακαλώ γράψτε ένα όνομα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Παρακαλούμε γράψε έναν κωδικό πρόσβασης" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Παρακαλούμε γράψε ένα θέμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Παρακαλούμε γράψε ένα έγκυρο email" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Παρακαλούμε γράψε μία έγκυρη διεύθυνση email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Παρακαλούμε γράψε μερικές λεπτομέρειες" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Παρακαλούμε γράψε το email σου" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Παρακαλούμε γράψε το όνομά σου" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Παρακαλούμε γράψε το ονοματεπώνυμό σου, οι υπηρεσίες χρειάζονται αυτή την πληροφορία – αν δεν επιθυμείς να εμφανίζεται το όνομά σου στην ιστοσελίδα, ξετσέκαρε το πεδίο παρακάτω" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Παρακαλούμε γράψε το όνομά σου" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Παρακαλούμε γράψε τον αριθμό τηλεφώνου σου" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Παρακαλούμε γράψε το επίθετό σου" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Παρακαλούμε γράψε τον τίτλο σου" @@ -2874,7 +2890,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Παρακαλούμε σήμανε αν θα ήθελες να λάβεις άλλο ερωτηματολόγιο" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2900,11 +2916,11 @@ msgstr "Παρακαλούμε σημείωσε ότι η ενημέρωσή σ msgid "Please note:" msgstr "Παρακαλούμε σημείωσε ότι:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2940,16 +2956,16 @@ msgstr "Παρακαλούμε δήλωσε αν το πρόβλημα έχει #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "Παρακαλούμε ανέβασε μία εικόνα μόνο" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Παρακαλούμε γράψε ένα μήνυμα" @@ -2985,12 +3001,12 @@ msgstr "Βασισμένο στην reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3492,20 +3522,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "Πρότυπα απαντήσεων για %s" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Σωστή τοποθεσία;" @@ -3517,15 +3547,15 @@ msgstr "Χειριστής δρόμου για την ονομασμένη οδ msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Χειριστής δρόμου για την ονομασμένη οδο (από το OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Περιστροφή αριστερά" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3536,23 +3566,23 @@ msgstr "Περιστροφή δεξιά" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Αν περιστρέψετε την φωτογραφία θα χαθούν οι αλλαγές που κάνατε στην αναφορά." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Δορυφόρος" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Αποθήκευση αλλαγών" @@ -3561,12 +3591,12 @@ msgstr "Αποθήκευση αλλαγών" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3576,7 +3606,8 @@ msgstr "" msgid "Search Reports" msgstr "Αναζήτηση Αναφορών" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Αναζήτηση Χρηστών" @@ -3585,7 +3616,7 @@ msgid "Search reports" msgstr "Αναζήτηση αναφορών" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Αναζήτηση:" @@ -3595,7 +3626,7 @@ msgstr "Αναζήτηση:" msgid "Searching found no reports." msgstr "Η αναζήτηση δε βρήκε καμία αναφορά." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Η αναζήτηση δε βρήκε κανένα χρήστη." @@ -3611,17 +3642,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Επίλεξε ένα σώμα" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Διάλεξε μια περιοχή" @@ -3641,15 +3673,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3658,7 +3690,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "Επιστροφή αναφοράς" @@ -3685,7 +3717,7 @@ msgstr "Υπηρεσία:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3694,9 +3726,9 @@ msgid "Share" msgstr "Κοινοποίηση" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3704,15 +3736,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3724,7 +3756,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Δημόσια προβολή του ονόματός μου" @@ -3736,21 +3768,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Προβολή καρφιτσών" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3793,8 +3825,8 @@ msgstr "Αποσύνδεση" msgid "Some categories may require additional information." msgstr "Μερικές κατηγορίες ίσως απαιτούν πρόσθετες πληροφορίες." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3809,6 +3841,14 @@ msgstr "Μερικές φωτογραφίες από πρόσφατες αναφ msgid "Some text to localize" msgstr "Κείμενο για εντοπισμό" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Συγνώμη, φαίνεται πως αυτός ο ταχυδρομικός κώδικας είναι Crown dependency postcode, δεν καλύπτουμε τέτοιους ΤΚ," @@ -3826,7 +3866,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Συγνώμη, υπήρξε βλάβη στην επιβεβαίωση του προβλήματός σου." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3848,7 +3888,7 @@ msgstr "Συγνώμη, δεν μπορέσαμε να αναλύσουμε αυ msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Λυπούμαστε, δεν μπορέσαμε να αποθηκεύσουμε τις εικόνες σας, παρακαλούμε προσπαθήστε ξανά." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3858,15 +3898,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3874,31 +3914,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Κατάσταση" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3911,14 +3952,14 @@ msgstr "" msgid "State:" msgstr "Κατάσταση:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3934,7 +3975,7 @@ msgid "Status" msgstr "Κατάσταση" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3947,7 +3988,7 @@ msgstr "Street View" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3955,12 +3996,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Τμήμα/Σώμα" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Θέμα" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Θέμα:" @@ -3978,7 +4019,7 @@ msgstr "Υποβολή" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3999,7 +4040,8 @@ msgstr "Υποβλήθηκε" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Γίνε συνδρομητής" @@ -4007,21 +4049,29 @@ msgstr "Γίνε συνδρομητής" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4041,11 +4091,11 @@ msgstr "Περιληπτικές αναφορές" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4063,8 +4113,8 @@ msgstr "" msgid "Template «%s»" msgstr "Πρότυπο «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4074,7 +4124,7 @@ msgstr "Πρότυπα" msgid "Text" msgstr "Κείμενο" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Έκδοση απλού κειμένου" @@ -4118,7 +4168,7 @@ msgstr "Ευχαριστούμε, χαιρόμαστε που διορθώθηκ msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Η εικόνα δεν φαίνεται να έχει μεταφορτωθεί σωστά (%s), παρακαλούμε προσπάθησε ξανά." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Η τοποθεσία δεν φαίνεται να βρίσκεται στην αρμοδιότητα κάποιου συμβουλίου. Ίσως είναι εκτός ακτής ή εκτός της χώρας. Παρακαλούμε προσπάθησε ξανά." @@ -4132,11 +4182,11 @@ msgstr "Η τοποθεσία δεν φαίνεται να βρίσκεται σ msgid "That postcode was not recognised, sorry." msgstr "Ο ταχυδρομικός κώδικας δεν αναγνωρίστηκε, λυπούμαστε." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Αυτό το πρόβλημα έχει σημειωθεί ως απεσταλμένο." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Το πρόβλημα τώρα θα αποσταλθεί ξανά." @@ -4148,23 +4198,23 @@ msgstr "Η αναφορά δεν μπορεί να προβληθεί σε %s." msgid "That report has been removed from FixMyStreet." msgstr "Η αναφορά αφαιρέθηκε από το FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4172,31 +4222,31 @@ msgstr "" "Οι αναφορές αυτής της κατηγορίας θα σταλθούν στη διεύθυνση email.\n" "Άλλες κατηγορίες αυτού του σώματος ίσως έχουν την ίδια διεύθυνση email." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "Το σημείο τερματισμού είναι η διεύθυνση URL της υπηρεσίας στην οποία συνδέεται το FixMyStreet όταν στέλνονται αναφορές σε αυτό το σώμα." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "Η αρμοδιότητα χρειάζεται μόνο αν το σημείο τερματισμού υπηρετεί παραπάνω από έναν. Αν το σώμα έχει το δικό του σημείο τερματισμού, μπορείς συνήθως να την αφήσεις κενή." -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4208,8 +4258,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Η ιδιότητα agency_responsible του Open311 v2 χρησιμοποιείται για να καταγράφονται οι υπηρεσίες που έλαβαν την αναφορά προβλήματος, που δεν είναι ακριβώς ο τρόπος με τον οποίο ορίζεται αυτή η ιδιότητα στις προδιαγραφές του Open311 v2." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4226,12 +4276,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Η υπηρεσία δεν θα μπορέσει να βοηθήσει εκτός αν συμπληρώσεις όσες περισσότερες λεπτομέρειες μπορείς. Παρακαλούμε περίγραψε την ακριβή τοποθεσία του προβλήματος (για παράδειγμα: πάνω στον κόκκινο τοίχο), ποιο είναι αυτό, για πόσο καιρό υπάρχει, μία περιγραφή (και μία φωτογραφία του προβλήματος αν έχεις), κλπ." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Ο πίνακας βραβείων επιμέλειας δείχνει τη δραστηριότητα των συντακτών (ποιος έχει συντάξει τις περισσότερες καταγραφές)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Το σφάλμα ήταν: %s" @@ -4277,7 +4327,7 @@ msgstr "Τα πιο πρόσφατα προβλήματα στα όρια του msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Ο σύνδεσμος ίσως έχει λήξει, ή μπορεί να μην τον επικολλήσατε σωστά." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Η λίστα των διαθέσιμων περιοχών παρέχεται από την υπηρεσία MapIt στις %s." @@ -4298,20 +4348,20 @@ msgstr "Η ζητούμενη διεύθυνση URL '%s' δε βρέθηκε σ msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Ο χρήστης δεν μπορέσε να εντοπίσει το πρόβλημα στον χάρτη, αλλά για να δει την περιοχή κοντά στην τοποθεσία έγραψε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4325,7 +4375,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Δεν υπάρχουν αναφορές προς εμφάνιση." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4333,8 +4387,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Υπήρξε πρόβλημα στην προβολή της σελίδας Όλες οι Αναφορές. Παρακαλούμε προσπάθησε ξανά αργότερα." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Υπήρξε πρόβλημα στην προβολή αυτής της σελίδας. Παρακαλούμε προσπάθησε αργότερα." @@ -4356,7 +4410,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Υπήρξε πρόβλημα με την ενημέρωσή σου. Παρακαλούμε προσπάθησε ξανά." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Υπήρξαν προβλήματα με την αναφορά σου. Παρακαλούμε δες παρακάτω." @@ -4373,8 +4427,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4386,7 +4440,7 @@ msgstr "" "Δεν χρειάζεται να τις ρυθμίσεις αν η Μέθοδος Αποστολής είναι μέσω email.\n" "Για περισσότερες πληροφορίες σχετικά με το Open311, δες αυτό το άρθρο." -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4404,7 +4458,7 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Αυτή η υλοποίηση του API είναι έργο σε εξέλιξη και δεν είναι ακόμη σταθερή. Θα αλλάξει χωρίς προειδοποιήσεις στο μέλλον." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4414,12 +4468,12 @@ msgstr "" "Συνεπώς, καμία από τις κατηγορίες του δε θα εμφανιστούν στο μενού κατηγοριών όταν οι χρήστες αναφέρουν προβλήματα.\n" "Μέχρι στιγμής, οι χρήστες δεν μπορούν να αναφέρουν προβλήματα σε αυτό το σώμα." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Αυτό η υπηρεσία δεν έχει επαφές. Αυτό σημαίνει ότι μέχρι στιγμής τα προβλήματα που αναφέρονται σε αυτήν την υπηρεσία δεν θα στέλνονται." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4427,18 +4481,17 @@ msgstr "" "Αυτή η υπηρεσία θα δέχεται μόνο αναφορές για προβλήματα που βρίσκονται στην περιοχή αρμοδιότητας της.\n" "Μια υπηρεσία δεν θα δέχεται καμία αναφορά, εκτός αν είναι αρμόδια για τουλάχιστον μία περιοχή." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Αυτό το email στάλθηκε και στις δύο υπηρεσίες που είναι αρμόδιες για την τοποθεσία του προβλήματος, μιας και ο χρήστης δεν το κατηγοριοποίησε. Παρακαλούμε αγνόησέ το αν η υπηρεσία σου δεν είναι αρμόδια για την αντιμετώπιση του ζητήματος, ή ενημέρωσέ μας για τη σωστή κατηγορία του προβλήματος ώστε να την προσθέσουμε στο σύστημα." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Αυτό το email στάλθηκε σε πολλές υπηρεσίες που είναι αρμόδιες για την τοποθεσία του προβλήματος, αφού η επιλεγμένη κατηγορία συμπεριλαμβάνεται σε κάθε μια από αυτές. Παρακαλούμε αγνόησέ το αν η υπηρεσία σου δεν είναι αρμόδια για την αντιμετώπιση του ζητήματος." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Αυτή η πληροφορία απαιτείται" @@ -4455,7 +4508,11 @@ msgstr "Αυτή είναι μια ιστοσελίδα για προγραμμ msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4471,12 +4528,16 @@ msgstr "Αυτό το πρόβλημα δεν έχει διορθωθεί" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Αυτή η αναφορά αναμένει έγκριση." @@ -4497,7 +4558,7 @@ msgstr "Αυτή η αναφορά είναι προς το παρόν κατα msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Αυτή η ιστοσελίδα περιέχει επίσης μία φωτογραφία του προβλήματος, που παρέχεται από το χρήστη." @@ -4508,7 +4569,7 @@ msgstr "Αυτή η ιστοσελίδα περιέχει επίσης μία φ msgid "Time spent (in minutes):" msgstr "Χρόνος που αφιερώθηκε (λεπτά):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Χρονοδιάγραμμα" @@ -4546,7 +4607,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Για την προβολή ενός χάρτη με την ακριβή τοποθεσία του ζητήματος" @@ -4575,34 +4636,34 @@ msgstr "" msgid "Total" msgstr "Σύνολο" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Δοκίμασε ξανά" @@ -4621,16 +4682,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4648,7 +4709,7 @@ msgstr "Άγνωστο είδος ειδοποίησης" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Άγνωστο σφάλμα" @@ -4661,7 +4722,7 @@ msgstr "Άγνωστο σφάλμα" msgid "Unknown problem ID" msgstr "Άγνωστη ταυτότητα προβλήματος" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4674,7 +4735,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Ενημέρωση" @@ -4683,16 +4744,16 @@ msgstr "Ενημέρωση" msgid "Update %s created for problem %d; by %s" msgstr "Η ενημέρωση %s δημιουργήθηκε για το πρόβλημα %d από %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Η παρακάτω ενημέρωση προστέθηκε ανώνυμα στις %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Η παρακάτω ενημέρωση προστέθηκε από %s στις %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Ενημέρωση σώματος" @@ -4717,7 +4778,7 @@ msgstr "Η ενημέρωση επισήμανε το πρόβλημα ως δι msgid "Update reopened problem" msgstr "Η ενημέρωση άνοιξε ξανά το πρόβλημα" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Καταστάσεις ενημέρωσης" @@ -4735,14 +4796,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Ενημερώθηκε!" @@ -4767,12 +4828,12 @@ msgstr "Ενημερώσεις για {{title}}" msgid "Updates to this problem, %s" msgstr "Ενημερώσεις για το πρόβλημα, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4782,15 +4843,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4799,48 +4860,48 @@ msgstr "" msgid "Used map" msgstr "Χάρτης σε χρήση" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Η επισήμανση του χρήστη αφαιρέθηκε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Ο χρήστης επισημάνθηκε" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Η αναζήτηση χρηστών βρίσκει αποτελέσματα για ονόματα χρηστών και διευθύνσεις email." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4849,20 +4910,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Χρήστες" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Οι τιμές ενημερώθηκαν" @@ -4896,12 +4957,12 @@ msgstr "Προβολή αναφορών ανά πτέρυγα" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Προβάλλεται μία τοποθεσία" @@ -4936,7 +4997,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "Χρειαζόμαστε το email σου, παρακαλώ γράψ" το παρακάτω." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Καταλαβαίνουμε ότι το πρόβλημα ίσως είναι στην ευθύνη του %s. Ωστόσο, μέχρι στιγμής δεν έχουμε πληροφορίες επικοινωνίας μαζί τους. Αν γνωρίζεις μία κατάλληλη διεύθυνση επικοινωνίας, παρακαλούμε επικοινώνησε μαζί τους." @@ -4951,8 +5012,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Θα χρησιμοποιήσουμε τις προσωπικές σου πληροφορίες μόνο σύμφωνα με την πολιτική απορρήτου." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4966,8 +5027,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "Θα σου απαντήσουμε όσο το δυνατόν συντομότερα." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Όταν διορθώθηκε" @@ -4987,14 +5052,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "Ήρεμα ρε Τεστίνο! Τρεις φωτογραφίες είναι αρκετές." - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "Μόνο αυτό? Πρόσθεσε περισσότερες ειδοποιήσεις δωρεάν." @@ -5015,15 +5076,19 @@ msgstr "Θα ήθελες να συνεισφέρεις στο FixMyStreet; Ο msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Θα ήθελες να λάβεις και άλλο ερωτηματολόγιο σε 4 εβδομάδες, για να σου υπενθυμίσει να ελέγξεις την τρέχουσα κατάσταση;" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Να χρησιμοποιείς τα κατάλληλα σημεία στίξης και να αποφεύγεις να γράφεις μόνο με κεφαλαία γράμματα, ώστε το μήνυμά σου να είναι εύκολο στην ανάγνωση." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5032,20 +5097,19 @@ msgstr "Να χρησιμοποιείς τα κατάλληλα σημεία σ #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ναι" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Παραπονιέσαι ότι, αυτή η αναφορά προβλήματος διαγράφτηκε από τον διαχειριστή χωρίς λόγο: " -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5053,7 +5117,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Με το παρόν, δηλώνεις ότι η παρακάτω αναφορά προβλήματος είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Με το παρόν, δηλώνεις ότι η παρακάτω ενημέρωση είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο: " @@ -5066,7 +5130,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Μπορείς να δεις το πρόβλημα σε αυτόν τον ιστότοπο." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Μπορείς να προσθέσεις την ηλεκτρονική διεύθυνση ενός καταχρηστικού χρήστη στην λίστα καταχρήσεων, κάτι που αυτόματα θα αποκρύπτει (και δεν θα αποστέλλει) αναφορές που αυτός δημιουργεί." @@ -5074,7 +5138,7 @@ msgstr "Μπορείς να προσθέσεις την ηλεκτρονική msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Μπορείς να επικοινωνήσεις για τεχνική υποστήριξη στο %s" @@ -5095,15 +5159,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Μπορείς να μας βοηθήσεις με το να βρεις ένα email επικοινωνίας για τα τοπικά προβλήματα για %s και να μας την στείλεις με e-mail στο %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Μπορείς να επισημάνεις έναν τομέα ως διαγεγραμμένο αν δεν θέλεις να είναι ενεργός σε αυτόν τον ιστότοπο." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Έχεις υποχωρήσει - παρακαλούμε συμπλήρωσε το κουτί που υπάρχει παραπάνω." -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5169,7 +5233,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Θα πρέπει να προσθέσεις κάποιες υπηρεσίες (όπως υπηρεσίες ή τομείς) πριν να είναι διαθέσιμη η αποστολή αναφορών." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5194,9 +5258,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Το e-mail σου" @@ -5212,10 +5277,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Οι πληροφορίες σου θα χρησιμοποιηθούν μόνο σύμφωνα με την πολιτική απορρήτου" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Το όνομά σου" @@ -5231,7 +5296,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5254,7 +5319,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Ο αριθμός τηλεφώνου σου" @@ -5279,7 +5344,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5296,25 +5361,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5348,8 +5412,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "επεξεργασία χρήστη" @@ -5358,12 +5422,12 @@ msgstr "επεξεργασία χρήστη" msgid "from %s different users" msgstr "από %s διαφορετικούς χρήστες" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "τελευταία ενημέρωση %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "λιγότερο από ένα λεπτό" @@ -5374,7 +5438,7 @@ msgid "n/a" msgstr "μη διαθέσιμο" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5414,7 +5478,7 @@ msgstr "αναφέρθηκε αρχικά από: “%s”" msgid "other areas:" msgstr "άλλες περιοχές:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5422,7 +5486,7 @@ msgstr "" msgid "sign out" msgstr "έξοδος" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5439,19 +5503,19 @@ msgstr "δεν υπάρχει καρφίτσα στον χάρτη επειδή msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "αυτή η κατηγορία τοπικού προβλήματος" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "σήμερα" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5467,11 +5531,11 @@ msgstr "ο χρήστης είναι από την ίδια υπηρεσία ό msgid "user is problem owner" msgstr "ο χρήστης είναι ο ιδιοκτήτης του προβλήματος" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5480,35 +5544,35 @@ msgstr "" msgid "ward" msgstr "πτέρυγα" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d ημέρα" msgstr[1] "%d ημέρες" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ώρα" msgstr[1] "%d ώρες" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d λεπτό" msgstr[1] "%d λεπτά" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5522,14 +5586,14 @@ msgid_plural "%d supporters" msgstr[0] "%d υποστηρικτής" msgstr[1] "%d υποστηρικτές" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d εβδομάδα" msgstr[1] "%d εβδομάδες" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5599,7 +5663,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s ενημέρωση σε αναφορές" msgstr[1] "%s ενημερώσεις σε αναφορές" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5620,7 +5684,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Δεν έχουμε ακόμη λεπτομέρειες για το συμβούλιο που είναι αρμόδιο σε αυτήν την τοποθεσία." msgstr[1] "Δεν έχουμε ακόμη λεπτομέρειες για τις υπηρεσίες που είναι αρμόδιες σε αυτήν την τοποθεσία." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po index 870da4a88e9..0a1c75259d4 100644 --- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Spanish (https://www.transifex.com/mysociety/teams/12067/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr " y " -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr " y " msgid " or " msgstr " o " -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "%d caracteres máximo." -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d ediciones por %s" @@ -48,7 +48,7 @@ msgstr "%d ediciones por %s" msgid "%d to %d of %d" msgstr "%d a %d de %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "%d usuarios ya existen" @@ -154,7 +154,7 @@ msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)" msgid "(no longer exists)" msgstr "(ya no existe)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(no enviadas al ayuntamiento)" @@ -163,11 +163,11 @@ msgstr "(no enviadas al ayuntamiento)" msgid "(optional)" msgstr "(opcional)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "(enviado a todos)" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(enviado a ambos)" @@ -176,13 +176,13 @@ msgstr "(enviado a ambos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(también tenemos feeds RSS para problemas en %s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Escoja una categoría --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "-- Escoja una opción --" @@ -190,8 +190,8 @@ msgstr "-- Escoja una opción --" msgid "--Choose a template--" msgstr "--Elegir una plantilla--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -206,11 +206,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "

Informes, estadísticas y acciones para

%s

" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr " %s informes %s" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%s guardado" @@ -235,11 +235,11 @@ msgstr "No- confirmar mi actualización por email" msgid "No Let me confirm my update by email/text" msgstr "No Quiero confirmar mi actualización a través de email o mensaje de texto" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Nota\\: Este informe se ha enviado para la acción. Los cambios realizados no se transmitirán." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Nota\\: Este informe aún no ha sido enviado para la acción. Cualquier cambio hecho no puede ser enviado." @@ -259,8 +259,8 @@ msgstr "Activar autenticación doble" msgid "Add" msgstr "Agregar" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -270,13 +270,13 @@ msgstr "" "al que se puede enviar las notificaciones. Puedes asignar uno o más contactos a cada\n" "órgano para las diferentes categorías de problemas." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Añada un contacto usando el siguiente formulario." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Agregue un órgano" @@ -297,8 +297,8 @@ msgstr "Añadir campo" msgid "Add fixed state" msgstr "Añadir estado de reparación" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Agregar nueva categoría" @@ -313,27 +313,27 @@ msgstr "Agregar número de teléfono" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Añadir a favoritos" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Añadir un usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Añadir/editar categoría de problemas" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Añadir / editar prioridades de respuesta" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Añadir / editar plantillas de respuesta" @@ -341,7 +341,7 @@ msgstr "Añadir / editar plantillas de respuesta" msgid "Added %s" msgstr "Añadido %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Añadir este informe a tu lista de favoritos lo eliminará de la lista de favoritos de %s." @@ -370,7 +370,6 @@ msgstr "Notificadme actualizaciones futuras" msgid "Alerts:" msgstr "Alertas:" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -417,11 +416,15 @@ msgstr "Todas las notificaciones entre %s y %s" msgid "All time" msgstr "Todo el tiempo" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "Alternativamente, podemos ocultar tu nombre en todos tus informes y actualizaciones en el sitio\\:" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "Siempre cargar todos los problemas" @@ -440,9 +443,9 @@ msgid "Anonymous user" msgstr "Usuario anónimo" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anónimo:" @@ -451,29 +454,29 @@ msgstr "Anónimo:" msgid "Another user" msgstr "Otro usuario" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "¿Estás seguro que quieres cancelar esta carga?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "¿Estás seguro?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Área cubierta" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Área:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Puesto que éste es un servidor de integración y %s es falsa, las notificaciones serán enviados al email del propio informante, no al contacto establecido para la categoría de problema." @@ -494,11 +497,11 @@ msgstr "Asignar a un órgano externo:" msgid "Assign to subdivision:" msgstr "Asigne a la subdivisión:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "Asignar usuarios a áreas" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Asignado a %s" @@ -510,8 +513,8 @@ msgstr "Se devuelven hasta %d solicitudes en cada consulta. Dichas solicitudes s msgid "At the moment only searching for and looking at reports work." msgstr "Por el momento sólo funcionan la búsqueda y consulta de notificaciones." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "Los usuarios del personal autorizado pueden asociarse con las categorías en las que operan." @@ -527,7 +530,7 @@ msgstr "Auto-respuesta \\:" msgid "Automated" msgstr "Automático" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -548,11 +551,11 @@ msgstr "Evite la información personal y las matrículas de vehículos" msgid "Awaiting moderation" msgstr "En espera de revisión" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Atras" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Volver a todos los informes" @@ -560,10 +563,10 @@ msgstr "Volver a todos los informes" msgid "Ban user" msgstr "Bloquear usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -572,17 +575,17 @@ msgstr "Órganos administrativos" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Órgano administrativo" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Órgano administrativo:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "Archivo CSV" @@ -598,7 +601,7 @@ msgstr "¿No puede encontrar nuestro correo electrónico? Revise su carpeta de s msgid "Can't see the map? Skip this step" msgstr "¿No puedes ver el mapa? Salte este paso" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -609,15 +612,15 @@ msgstr "Categorías" msgid "Categories:" msgstr "Categorías:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -630,7 +633,7 @@ msgstr "Categoría" msgid "Category and State" msgstr "Categoría y Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categoría cambiada de '%s' a '%s'" @@ -640,9 +643,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Ratio de arreglo de problemas > 4 semanas" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -669,11 +672,11 @@ msgstr "Cambiar contraseña" msgid "Change phone number" msgstr "Cambiar número de teléfono" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "Haga la comprobación necesaria si los informes de esta categoría deben ser inspeccionados antes de enviarlos." -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -691,7 +694,7 @@ msgstr "" "no hay mayor interés en ser desplegados. En el Reino Unido, hemos utilizado esto para servicios como requerir un\n" "basurero extra en una dirección específica" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -699,11 +702,11 @@ msgstr "" "Elegir un nombre de categoria que tenga sentido para el público (por ejemplo, \"baches\", \"alumbrado público\") y que sea también útil\n" "para el organismo administrativo. Las categorías aparecerán en un menú desplegable al notificar un problema." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "Elija otro" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "Borrar datos sin conexión" @@ -735,9 +738,13 @@ msgstr "Haz clic en el enlace de ese correo electrónico para iniciar sesión." msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -781,17 +788,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "Código" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "Cerrar mapa" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuración" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Confirmar" @@ -812,9 +819,9 @@ msgstr "Confirmar por email, proporcionando una nueva contraseña. Al confirmar, msgid "Confirmation" msgstr "Confirmación" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Confirmado" @@ -844,7 +851,11 @@ msgstr "Contactar con el equipo" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -853,12 +864,12 @@ msgstr "" msgid "Coordinates:" msgstr "Coordenadas:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "No se pudo encontrar el usuario" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "No se pudo consultar la ubicación" @@ -866,9 +877,11 @@ msgstr "No se pudo consultar la ubicación" msgid "Council" msgstr "Ayuntamiento" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Contactos del ayuntamiento para %s" @@ -897,8 +910,8 @@ msgstr "Crear una notificación" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Crear una categoría" @@ -906,15 +919,15 @@ msgstr "Crear una categoría" msgid "Create priority" msgstr "Crear una prioridad" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "Crear reportes/actualizaciones como usuario anónimo" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "Crear reportes/actualizaciones como el Ayuntamiento" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "Crear reportes/actualizaciones a nombre de un usuario" @@ -928,7 +941,7 @@ msgstr "Crear plantilla" msgid "Created" msgstr "Creado" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "Creados %d nuevos usuarios" @@ -951,12 +964,12 @@ msgstr "Token actual:" msgid "Currently grouped by %s" msgstr "Actualmente agrupados por %s" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "No se han creado organismos aún." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Cliente no localizable" @@ -984,32 +997,32 @@ msgstr "Por defecto" msgid "Default priority" msgstr "Prioridad por defecto" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "Tipo por defecto" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "Eliminar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Eliminar plantilla" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Eliminado" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "Describa por qué está moderando esto" @@ -1025,18 +1038,18 @@ msgstr "Descripción" msgid "Description:" msgstr "Descripción:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "La información detallada está limitada a %d caracteres." -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detalles" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1047,7 +1060,7 @@ msgstr "Detalles:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Transferido" @@ -1056,24 +1069,24 @@ msgstr "Transferido" msgid "Didn't use map" msgstr "No usó mapa" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Ranking de premios a la constancia" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "Desactivar" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "Desactivados:" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "Descartar cambios" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1082,7 +1095,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "¿Tiene una contraseña de %s?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1090,7 +1103,7 @@ msgstr "" msgid "Don’t know" msgstr "No lo sé" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "¿No te gustan los formularios?" @@ -1098,19 +1111,19 @@ msgstr "¿No te gustan los formularios?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Arrastre aquí su(s) foto(s) o haga clic para subirla(s)" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "Duplicado de" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "Duplicados" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1121,8 +1134,8 @@ msgstr "" "Diferentes categorías pueden tener el mismo contacto.\n" "Esto significa que puede agregar muchas categorías incluso si tiene un solo contacto para el órgano." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1130,23 +1143,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Editar" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Editar los detalles del órgano administrativo" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "Editar los permisos de otros usuarios" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Editar la categoría del reporte" @@ -1154,15 +1167,15 @@ msgstr "Editar la categoría del reporte" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Editar la prioridad del reporte" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Editar reportes" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "Editar detalles de usuarios/buscar sus reportes" @@ -1185,28 +1198,28 @@ msgstr "Editando el problema %d" msgid "Editing update %d" msgstr "Editando la actualización %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Editando el usuario %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Editor" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email:" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1235,37 +1248,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "Email verificado:" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Email:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "Activar" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1273,8 +1286,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1286,8 +1299,8 @@ msgstr "" "Para obtener más información, consulte\n" "este documento." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1297,8 +1310,8 @@ msgstr "" "tienen diferentes vías para recibir (y enviar) actualizaciones. Por ejemplo, si los informes para algunas categorías de \n" "incidencia deben ser enviadas por correo electrónico, mientras que otros pueden ser enviados a través Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "Activar esto suprimirá el mensaje de error que normalmente se muestra cuando una actualización no tiene descripción" @@ -1306,7 +1319,7 @@ msgstr "Activar esto suprimirá el mensaje de error que normalmente se muestra c msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Punto final" @@ -1328,10 +1341,6 @@ msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área msgid "Enter a nearby street name and area" msgstr "Introduzca el nombre de una calle cercana" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "Ingrese una calle, área o lugar de referencia" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Introduzca detalles del problema" @@ -1345,13 +1354,13 @@ msgstr "Introduzca detalles del problema" msgid "Error" msgstr "Error" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Todo" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Ejemplo de código postal %s" @@ -1363,11 +1372,11 @@ msgstr "Ejemplos:" msgid "Existing category" msgstr "Categoría existente" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "Los usuarios existentes no serán modificados." -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "Expandir mapa" @@ -1384,7 +1393,7 @@ msgstr "Exportar como CSV" msgid "External ID" msgstr "ID externo" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "URL Externo" @@ -1405,25 +1414,25 @@ msgstr "" msgid "External team" msgstr "Equipo externo" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "Campos adicionales" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Datos adicionales:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Detalles adicionales" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "Campos adicionales:" @@ -1446,11 +1455,12 @@ msgstr "" msgid "Filter report list" msgstr "Filtrar lista de informes" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Primera vez" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Arreglar esto eligiendo un área cubierta en el formulario Editar detalles del organismo a continuación." @@ -1470,9 +1480,9 @@ msgstr "Arreglado - Ayuntamiento" msgid "Fixed - User" msgstr "Arreglado - Usuario" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Marcar como borrado" @@ -1480,8 +1490,8 @@ msgstr "Marcar como borrado" msgid "Flag user" msgstr "Marca usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Marcado" @@ -1489,7 +1499,7 @@ msgstr "Marcado" msgid "Flagged reports and users" msgstr "Señalizar informes y usuarios" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Los usuarios marcados se listan en página demarcados" @@ -1498,7 +1508,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Las capacidades de los \"usuarios marcados\" no se limitan de ninguna manera. Es solo una lista de usuarios que han sido marcado para observación." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Marcado:" @@ -1514,7 +1524,7 @@ msgstr "Para mejores resultados, incluya una vista general y una de detalle" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "Para cada opción, Key es el valor almacenado en la base de datos para esa opción y Name es el valor que se muestra al usuario." -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Para más información, vea Cómo FixMyStreet usa Mapit." @@ -1528,11 +1538,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "¿Olvidó su contraseña?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Enviado al órgano externo" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1548,6 +1558,8 @@ msgstr "Generar Token" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Recibe actualizaciones" @@ -1578,9 +1590,9 @@ msgstr "¡Nos alegra saber que ha sido arreglado!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1590,7 +1602,7 @@ msgstr "Ir" msgid "Going to send questionnaire?" msgstr "¿Va a enviar cuestionario?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1598,7 +1610,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Gráfico temporal de creación problemas por estado" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "Grupo" @@ -1649,11 +1661,11 @@ msgstr "Oculto" msgid "Hidden Field" msgstr "Campo oculto" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "Ocultar todos los reportes y actualizaciones" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "Ocultar el reporte completo" @@ -1674,9 +1686,9 @@ msgstr "Ocultar mi nombre en esta actualización" msgid "Hide my name on this report" msgstr "Ocultar mi nombre en este reporte" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Ocultar marcadores" @@ -1693,11 +1705,11 @@ msgstr "¿Desea ocultar su nombre?" msgid "Hint" msgstr "Ayuda" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Historial" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Inicio" @@ -1705,7 +1717,7 @@ msgstr "Inicio" msgid "How to report a problem" msgstr "Cómo notificar un problema" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "¿Cómo enviar informes exitosos?" @@ -1727,7 +1739,7 @@ msgstr "No se ha podido localizar su problema en la base de datos.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1736,8 +1748,8 @@ msgstr "No se ha podido localizar su problema en la base de datos.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1761,7 +1773,7 @@ msgstr "Si se tiquea, el usuario no verá un campo para ingresar el dato, sino s msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1769,7 +1781,7 @@ msgstr "" "Si dos o más organismos tienen la misma ubicación, FixMyStreet combina categorías de notificaciones idénticas en una sola entrada en\n" "el menú. Asegúrese de que utiliza el mismo nombre categoría en ambos órganos si desea que sean combinadas." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "Si nos está contactando acerca de un reporte o actualización específicas, por favor incluya un link al reporte en su mensaje." @@ -1781,6 +1793,10 @@ msgstr "Si genera un token nuevo, el token existente dejará de funcionar." msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Si usted consigue algo más de información sobre el estado del problema, por favor regrese a esta web y añádale una actualización." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Si desea que esta prioridad sólo sea válida para una o más categoría(s) específica(s), elíjala aquí. Por defecto se mostrarán para todas las categorías." @@ -1810,34 +1826,34 @@ msgstr "" "Si desea agregar una actualización pública al problema, por favor anótela aquí\n" "(tome en cuenta que no será enviada al ayuntamiento)." -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Si utiliza un método de envío distinto del email, introduzca el ID de servicio (Open311) o identificador equivalente aquí." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID incorrecto" @@ -1845,7 +1861,7 @@ msgstr "ID incorrecto" msgid "Illegal feed selection" msgstr "Selección de listado incorrecta" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "Importar usuarios" @@ -1857,7 +1873,7 @@ msgstr "¿En tabla de abusones?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Los siguientes atributos, que no forman parte de la especificación Open311 v2, son adicionalmente devueltos: agency_sent_datetime, title (también se devuelve como parte de la descripción), interface_used, comment_count, requestor_name (solo si el solicitante permitió que el nombre que se mostrará en el sitio)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "Inactivo" @@ -1873,15 +1889,15 @@ msgstr "Incluir datos del notificador" msgid "Incorrect has_photo value \"%s\"" msgstr "Valor incorrecto para has_photo \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "Inspeccionar reporte" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "Inspección requerida" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "Instruir a contratistas que resuelvan los problemas" @@ -1889,7 +1905,7 @@ msgstr "Instruir a contratistas que resuelvan los problemas" msgid "Internal notes" msgstr "Notas internas" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "Falla de internet" @@ -1897,12 +1913,12 @@ msgstr "Falla de internet" msgid "Invalid agency_responsible value %s" msgstr "Valor inválido para agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Especificado un formato no válido %s." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "Ubicación inválida. La nueva ubicación debe estar cubierta por el mismo ayuntamiento." @@ -1923,7 +1939,7 @@ msgstr "" msgid "Label" msgstr "Etiqueta" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "Idioma" @@ -1936,8 +1952,8 @@ msgstr "Idiomas" msgid "Last 7 days" msgstr "Últimos 7 días" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Último editor" @@ -1953,17 +1969,17 @@ msgstr "Última actualización:" msgid "Last update:" msgstr "Última actualización:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "Latitud/Longitud:" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "Menos recientemente actualizado" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Deje en blanco si todos las notificaciones a este órgano administrativo utilizan el mismo método de envío (e.g., \"%s\")." @@ -1971,7 +1987,7 @@ msgstr "Deje en blanco si todos las notificaciones a este órgano administrativo msgid "List" msgstr "Lista" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Listar todos los problemas notificados" @@ -2015,16 +2031,16 @@ msgstr "Iniciar sesión con Facebook" msgid "Log in with Twitter" msgstr "Iniciar sesión con Twitter" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Iniciar sesión con email" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "Iniciar sesión con email/mensaje de texto" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "Cerrar todas las sesiones" @@ -2032,23 +2048,23 @@ msgstr "Cerrar todas las sesiones" msgid "Look up" msgstr "Buscar" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "MAPA" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "Volver anónimo en todos los reportes y actualizaciones" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "Orden manual" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr " Mapa" @@ -2056,15 +2072,15 @@ msgstr " Mapa" msgid "Mark as sent" msgstr "Marcado como enviado" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Señalar como marcados aquellos usuarios cuyo comportamiento desea observar." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Mensaje:" @@ -2080,19 +2096,19 @@ msgstr "Mensaje al órgano externo:" msgid "Missing bodies:" msgstr "Órganos faltantes:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Falta jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Moderar" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "Moderar detalles del reporte" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Moderar este reporte" @@ -2100,10 +2116,10 @@ msgstr "Moderar este reporte" msgid "Moderate this update" msgstr "Moderar esta actualización" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "Moderado por %s el %s" @@ -2121,12 +2137,12 @@ msgstr "" msgid "Month" msgstr "Mes" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Más comentado" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2138,11 +2154,11 @@ msgstr "Más comentado" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2151,7 +2167,7 @@ msgstr "Nombre" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Nombre:" @@ -2161,11 +2177,11 @@ msgstr "Nombre:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Navegar a éste problema" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "Dirección más cercana calculada:" @@ -2177,7 +2193,7 @@ msgstr "Nombre de la calle más cercana al marcador colocado en el mapa (se gene msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Código Postal más cercano al marcador colocado en el mapa (generado automáticamente): %s (%sm de distancia)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Camino más cercano al marcador colocado en el mapa (generado automáticamente por Bing Maps): %s" @@ -2203,11 +2219,11 @@ msgstr "¡Casi listo! Por favor revise su email." msgid "Nearly done! Now check your phone…" msgstr "¡Casi listo! Por favor revise su teléfono." -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Nuevo organismo añadido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Añadida nueva categoría de contactos" @@ -2243,23 +2259,23 @@ msgstr "Nuevo número de teléfono:" msgid "New priority" msgstr "Nueva prioridad" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "Nuevos problemas para %s" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "Nuevos problemas para %s" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2267,7 +2283,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Nuevos problemas en {{COUNCIL}} para el barrio {{WARD}} en FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "Nuevos problemas cerca de %s,%s" @@ -2303,11 +2319,11 @@ msgstr "Nuevo estado" msgid "New template" msgstr "Nueva plantilla" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "Nuevas actualizaciones al reporte %s" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2319,10 +2335,10 @@ msgstr "Siguiente" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2330,11 +2346,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "No" @@ -2342,11 +2357,7 @@ msgstr "No" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Sin órgano administrativo" @@ -2354,7 +2365,7 @@ msgstr "Sin órgano administrativo" msgid "No council selected" msgstr "Ningún ayuntamiento seleccionado" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "No se han hecho ediciones aún." @@ -2371,11 +2382,11 @@ msgstr "No se encuentran usuarios marcados" msgid "No further updates" msgstr "No hay más actualizaciones" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "No hubieron inspecciones a cargo de ese inspector en el rango de fechas seleccionado." -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "No hubieron inspecciones en el rango de fechas seleccionado." @@ -2383,12 +2394,12 @@ msgstr "No hubieron inspecciones en el rango de fechas seleccionado." msgid "No reports to show on map, here are some nearby:" msgstr "No hay reportes para mostrar en el mapa, aquí hay algunos cercanos:" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Ningún resultado devuelto" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2407,15 +2418,15 @@ msgstr "No hay seguidores" msgid "None" msgstr "Nada" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2439,13 +2450,13 @@ msgstr "No notificado anteriormente" msgid "Not reported to council" msgstr "No comunicado al ayuntamiento" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Nota" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Nota:" @@ -2469,15 +2480,15 @@ msgstr "Numero de problemas reportados en cada categoría en los últimos 7 día msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2485,16 +2496,16 @@ msgstr "" msgid "Old state" msgstr "Estado antiguo" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "A nombre de %s" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2505,7 +2516,7 @@ msgstr "A nombre de %s" msgid "Open" msgstr "Abierto" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2513,7 +2524,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 para el servidor FixMyStreet de mySociety" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2545,17 +2556,17 @@ msgstr "O suscríbase por RSS" msgid "Order" msgstr "Orden" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Otros" @@ -2580,8 +2591,8 @@ msgstr "Propietario" msgid "Page Not Found" msgstr "Página no encontrada" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Padre" @@ -2595,19 +2606,19 @@ msgstr "Parcial" msgid "Password (optional)" msgstr "Contraseña (opcional)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Enlace permanente" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Permisos:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "Permitir actualizaciones en blanco" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2627,17 +2638,16 @@ msgstr "Número de teléfono (opcional)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "Teléfono verificado:" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Teléfono:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2648,6 +2658,7 @@ msgstr "Teléfono:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2662,7 +2673,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "La foto es obligatoria." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Foto obligatoria" @@ -2691,11 +2702,15 @@ msgstr "Elija su ayuntamiento" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Coloque el marcador en el mapa" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Por favor, sea cortés, conciso y vaya al grano." @@ -2712,7 +2727,7 @@ msgstr "Por favor, comprueba la contraseña e inténtalo de nuevo" msgid "Please check your email address is correct" msgstr "Por favor, compruebe que su dirección de email es correcta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2720,11 +2735,11 @@ msgstr "Por favor, compruebe que su dirección de email es correcta" msgid "Please check your phone number is correct" msgstr "Por favor verifique que su número de teléfono es correcto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Por favor, elija una categoría" @@ -2733,8 +2748,9 @@ msgstr "Por favor, elija una categoría" msgid "Please choose a less commonly-used password" msgstr "Por favor elija una contraseña menos habitual" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Por favor, corrija los errores a continuación" @@ -2753,13 +2769,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Por favor notifique incidencias relevantes y no abuse; abusando de su ayuntamiento degrada su capacidad de servicio a toda la ciudadanía." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Por favor escriba su mensaje." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2767,90 +2783,90 @@ msgstr "Por favor escriba su mensaje." msgid "Please enter a mobile number" msgstr "Por favor ingrese un número de celular o móvil" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Por favor ingrese un nombre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "Por favor ingrese un nombre para éste órgano" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Por favor, introduzca una contraseña" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Por favor, introduzca un título" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Por favor, introduce una dirección de email válida" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Por favor, introduce una dirección de email válida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "Por favor ingrese un email o número de teléfono válidos" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Por favor, describa los detalles más relevantes" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Por favor, introduzca su dirección de email" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Por favor, indique su nombre" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Por favor escriba su nombre completo, ya que los ayuntamientos necesitan esta información. Si usted NO desea que su nombre aparecerá en la página, desactive la casilla de abajo" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Por favor, introduzca su nombre" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Por favor, introduzca su número de telefono" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Introduzca su segundo nombre" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Por favor, introduzca su título" @@ -2878,7 +2894,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique si le gustaría recibir algún otro cuestionario" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "Por favor asegúrese de que su contraseña tenga al menos %d caracteres" @@ -2904,11 +2920,11 @@ msgstr "Tome en cuenta que su actualización aún no ha sido publicadareputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "Los reportes se remitirán automáticamente si la reputación del usuario es igual o mayor a este valor. Ingrese 0 si todos los reportes deben ser inspeccionados." -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "Umbral de reputación" @@ -3496,20 +3526,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "Revertir al original" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "Revertir al texto original" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "Revertir al título original" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "¿Es correcto el lugar?" @@ -3521,15 +3551,15 @@ msgstr "Operador responsable de este camino (derivado del número de referencia msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador responsable de este camino (de OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rotar a la izquierda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3540,23 +3570,23 @@ msgstr "Rotar a la derecha" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rotar esta foto descartará los cambios del reporte que no hayan sido guardados." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satélite" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "Guardar como duplicado y cerrar " -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Guardar cambios" @@ -3565,12 +3595,12 @@ msgstr "Guardar cambios" msgid "Save new fields" msgstr "Guardar nuevos campos" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3580,7 +3610,8 @@ msgstr "" msgid "Search Reports" msgstr "Buscar Notificaciones" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Buscar Usuarios" @@ -3589,7 +3620,7 @@ msgid "Search reports" msgstr "Buscar informes" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Buscar:" @@ -3599,7 +3630,7 @@ msgstr "Buscar:" msgid "Searching found no reports." msgstr "La búsqueda no encontró notificaciones." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "La búsqueda no encontró usuarios." @@ -3615,17 +3646,18 @@ msgstr "Seguridad" msgid "See our privacy policy" msgstr "Vea nuestra política de privacidad" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Selecciona un órgano administrativo" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Seleccione un área" @@ -3645,15 +3677,15 @@ msgstr "" msgid "Select:" msgstr "Seleccionar:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "Enviar" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "Enviar email de inicio de sesión" @@ -3662,7 +3694,7 @@ msgstr "Enviar email de inicio de sesión" msgid "Sending a confirmation text failed: \"%s\"" msgstr "El envío del texto de confirmación falló: \"%s\"" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3689,7 +3721,7 @@ msgstr "Servicio:" msgid "Set password" msgstr "Asignar contraseña" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "Usar mi ubicación actual" @@ -3698,9 +3730,9 @@ msgid "Share" msgstr "Compartir" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3708,15 +3740,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3728,7 +3760,7 @@ msgstr "¿Mostrar la foto?" msgid "Show all updates" msgstr "Mostrar todas las actualizaciones" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Mostrar mi nombre públicamente" @@ -3740,21 +3772,21 @@ msgstr "¿Mostrar nombre publicamente?" msgid "Show older" msgstr "Mostrar los más antiguos" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "Mostrar los reportes más antiguos" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "Mostrar foto" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Mostrar marcadores" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "Mostrar nombre de la persona que reporta" @@ -3797,8 +3829,8 @@ msgstr "Salir" msgid "Some categories may require additional information." msgstr "Algunas categorías pueden requerir información adicional." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3815,6 +3847,14 @@ msgstr "Algunas fotos de notificaciones recientes" msgid "Some text to localize" msgstr "Algún texto para localizar" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Lo sentimos, ése parece ser un código postal dependiente de La Corona, que no soportamos." @@ -3832,7 +3872,7 @@ msgstr "Lo sentimos, el código es incorrecto" msgid "Sorry, there has been an error confirming your problem." msgstr "Lo sentimos, hubo un error confirmando su notificación." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3854,7 +3894,7 @@ msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Perdón, no pudimos guardar la(s) imágenes, por favor intente nuevamente." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3867,15 +3907,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "Perdón, usted no tiene permiso para hacer eso." -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Ordenados por" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "Los miembros del staff tienen permiso para acceder a la sección admin." -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "Staff:" @@ -3883,31 +3923,32 @@ msgstr "Staff:" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3920,14 +3961,14 @@ msgstr "" msgid "State:" msgstr "Estado/Prov.:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3943,7 +3984,7 @@ msgid "Status" msgstr "Estado" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3956,7 +3997,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "Subcategoría" @@ -3964,12 +4005,12 @@ msgstr "Subcategoría" msgid "Subdivision/Body" msgstr "Subdivisión/Órgano" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Título" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Título:" @@ -3987,7 +4028,7 @@ msgstr "Enviar" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -4008,7 +4049,8 @@ msgstr "Enviado" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Suscribirse" @@ -4016,21 +4058,29 @@ msgstr "Suscribirse" msgid "Subscribe by email" msgstr "Suscribirse por email" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "Suscrito:" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "Resuma el problema" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "Resuma sus cambios" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4050,11 +4100,11 @@ msgstr "Resumen de notificaciones" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4072,8 +4122,8 @@ msgstr "" msgid "Template «%s»" msgstr "Plantilla «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4083,7 +4133,7 @@ msgstr "Plantillas" msgid "Text" msgstr "Texto" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Versión solo texto" @@ -4127,7 +4177,7 @@ msgstr "¡Gracias, nos alegra saber que fue arreglado! ¿Podría decirnos si hab msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuevo." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Esa localización no parece estar cubierta por un ayuntamiento, tal vez esté en alta mar o fuera del país. Por favor, inténtelo de nuevo." @@ -4141,11 +4191,11 @@ msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo." msgid "That postcode was not recognised, sorry." msgstr "Ese código postal no fue reconocido, lo siento." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "El problema se ha marcado como enviado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "El problema ahora será reenviado." @@ -4157,23 +4207,23 @@ msgstr "Esa notificación no se puede ver en %s." msgid "That report has been removed from FixMyStreet." msgstr "Esa notificación ha sido eliminada de FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "Los detalles personales de ese usuario han sido eliminados." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "Los reportes y actualizaciones de ese usuario han sido ocultados." -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4181,8 +4231,8 @@ msgstr "" "El email indica dónde serán enviadas las notificaciones de esta categoría.\n" "Otras categorías de este mismo órgano administrativo podrían usar el mismo email." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4190,8 +4240,8 @@ msgstr "" "El destino es la URL del servicio al que FixMyStreet se conectará \n" "cuando envíe notificaciones al organismo administrativo." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." @@ -4199,17 +4249,17 @@ msgstr "" "Si la opción de agrupar subcategorías está habilitada, \n" "el grupo se usa para el campo de la categoría de nivel superior." -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "La jurisdicción solo es necesaria si los límites incluyen a más de un municipio. Si el organismo administrativo funciona solo con sus propios límites puede dejar en blanco esto." -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4221,8 +4271,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "El atributo Open311 v2 agency_responsible se utiliza para listar las administraciones que han recibido la notificación de problemas, que no es exactamente la forma en que se define dicho atributo en la especificación Open311 v2." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4239,12 +4289,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "El ayuntamiento necesita la mayor cantidad de detalles posibles para atender su notificación. Por favor, describa la ubicación exacta del problema (e.g. \"sobre tal o cual pared\"), en qué consiste éste, el tiempo que lleva ahí, una descripción y si es posible también una foto que permita localizarlo, etc." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Los premios a la responsabilidad muestran la actividad de los editores (quién ha editado más registros)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "El error fue: %s" @@ -4290,7 +4340,7 @@ msgstr "Últimos problemas dentro de los límites de {{NAME}} notificados por lo msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "El link parece haber expirado, o tal vez no fue copiado/pegado correctamente." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "La lista de áreas disponibles está siendo ofrecida por el servicio MapIt en %s." @@ -4311,20 +4361,20 @@ msgstr "La URL solicitada, '%s', no fue encontrada en el servidor" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "El tipo de campo que se muestra al usuario. Texto es un campo de texto simple, Lista es un menú desplegable." -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "El archivo CSV debe contener una fila de encabezado, y los registros deben tener los siguientes campos (en el mismo orden):" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "El usuario no pudo situar el problema en el mapa, salvo para ver el área alrededor de la localización que introdujo." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "Se ha enviado un email de inicio de sesión al usuario" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4338,7 +4388,11 @@ msgstr "" msgid "There are no reports to show." msgstr "No hay ninguna notificación que mostrar." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "Ya existe una plantilla de respuesta automática para esta categoría/estado." @@ -4346,8 +4400,8 @@ msgstr "Ya existe una plantilla de respuesta automática para esta categoría/es msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por favor, inténtelo de nuevo más tarde." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde." @@ -4369,7 +4423,7 @@ msgstr "Hubo un problema con su información de inicio de sesión. Si olvidó su msgid "There was a problem with your update. Please try again." msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Hubo problemas con su notificación. Por favor, vea más abajo." @@ -4386,8 +4440,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4400,7 +4454,7 @@ msgstr "" "Para obtener más información sobre Open311, consulte\n" "este documento." -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "Estos usuarios no fueron actualizados." @@ -4418,7 +4472,7 @@ msgstr "Serán remitidos a %s y publicados en línea , de acuer msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Esta implementación de la API es un trabajo aún en progreso y no es estable todavía. Se cambiará sin advertencias en el futuro." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4428,12 +4482,12 @@ msgstr "" "En consecuencia, ninguna de sus categorías aparecerá en el menú desplegable de categorías cuando los usuarios envíen incidencias.\n" "Actualmente, los usuarios no pueden informar de problemas a este organismo." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Este órgano no tiene contactos. Esto significa que en la actualidad las incidencias notificadas a este organismo no son enviadas." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4441,18 +4495,17 @@ msgstr "" "A este organismo sólo se enviarán informes de problemas que se encuentran en el área cubierta.\n" "Un organismo no recibirá ningún informe salvo que represente al menos un área." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Este correo electrónico ha sido enviado a los dos ayuntamientos que cubren la ubicación del problema, ya que el usuario no lo categorizó. Por favor, haga caso omiso del mismo si usted no es el organismo administrativo responsable de este problema, o háganos saber qué clase de problema es para que lo podamos añadir a nuestro sistema." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Este correo electrónico ha sido enviado a varios consejos que cubren la ubicación del problema, pues la categoría de problema seleccionada por el usuario se proporciona para todos ellos. Por favor, si usted no pertenece al órgano administrativo responsable de resolver esta incidencia haga caso omiso de este mensaje." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Esta información es necesaria" @@ -4469,7 +4522,11 @@ msgstr "Este es un sitio para desarrolladores, las cosas podrían romperse en cu msgid "This is the public text that will be shown on the site." msgstr "Texto público que se mostrará en el sitio." -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "Esta página es una manera rápida de crear varios usuarios del staff en un solo paso." @@ -4485,12 +4542,16 @@ msgstr "Este problema no se ha arreglado" msgid "This problem is still ongoing" msgstr "Este problema todavía persiste." +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "Este reporte es un duplicado. Por favor contribuya actualizando el reporte original:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Esta notificación está pendiente de moderación." @@ -4511,7 +4572,7 @@ msgstr "Esta notificación está marcada como abierta." msgid "This report is now closed to updates." msgstr "Este reporte ya no admite actualizaciones." -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Esta página web también contiene una foto del problema, proporcionada por el usuario." @@ -4522,7 +4583,7 @@ msgstr "Esta página web también contiene una foto del problema, proporcionada msgid "Time spent (in minutes):" msgstr "Tiempo utilizado (en minutos):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Cronología" @@ -4560,7 +4621,7 @@ msgstr "Para limitar esta colección de campos a un solo cobrand, selecciónelo msgid "To limit this collection of fields to a single language, select it here." msgstr "Para limitar esta colección de campos a un solo idioma, selecciónelo aquí." -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Para ver un mapa de la ubicación precisa de este problema" @@ -4589,34 +4650,34 @@ msgstr "" msgid "Total" msgstr "Total" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "Traducción" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "Traducciones" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Inténtelo de nuevo" @@ -4635,16 +4696,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "Tipo" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "Desbloquear" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4662,7 +4723,7 @@ msgstr "Tipo de alerta desconocida" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Error desconocido" @@ -4675,7 +4736,7 @@ msgstr "Error desconocido" msgid "Unknown problem ID" msgstr "ID de problema desconocido" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4688,7 +4749,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Actualizar" @@ -4697,16 +4758,16 @@ msgstr "Actualizar" msgid "Update %s created for problem %d; by %s" msgstr "Actualización %s creada para el problema %d; por %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "La actualización de abajo fue añadida de forma anónima en %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "La actualización de abajo fue añadida por %s en %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Actualizar órgano" @@ -4731,7 +4792,7 @@ msgstr "La actualización marcó el problema como arreglado" msgid "Update reopened problem" msgstr "La actualización reabrió el problema" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Actualización de estados" @@ -4749,14 +4810,14 @@ msgstr "Actualizado por %s (%s) el %s" msgid "Updated by %s at %s" msgstr "Actualizado por %s el %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "¡Actualizado!" @@ -4781,12 +4842,12 @@ msgstr "Actualizaciones en {{title}}" msgid "Updates to this problem, %s" msgstr "Actualizaciones a este problema, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "Notas de uso" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4801,15 +4862,15 @@ msgstr "" "Inactiva omitirá la categoría al reportar problemas\n" "pero la mantendrá para los filtros en el mapa, y eliminada quitará la categoría también de ahí." -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "Use este campo para registrar detalles que sólo se muestran en la sección admin. Lo ingresado no se mostrará al público ni se enviará al órgano." @@ -4818,48 +4879,48 @@ msgstr "Use este campo para registrar detalles que sólo se muestran en la secci msgid "Used map" msgstr "Mapa utilizado" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "Importación de Usuarios" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "Usuarios añadidos a la lista de abusos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "El usuario ya existe" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "El usuario ya está en la lista de abusos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Usuario marcado" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "Alertas del usuario" @@ -4868,20 +4929,20 @@ msgstr "Alertas del usuario" msgid "User:" msgstr "Usuario:" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Usuarios" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Valores actualizados" @@ -4915,12 +4976,12 @@ msgstr "Ver notificaciones por barrio" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Visualizando una ubicación" @@ -4955,7 +5016,7 @@ msgstr "Hemos enviado un código de confirmación a su teléfono. Por favor ingr msgid "We need your email address, please give it below." msgstr "Necesitamos su dirección de email, por favor ingréselo a continuación." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Somos conscientes de este problema podría ser responsabilidad de %s; sin embargo, actualmente no disponemos de sus datos de contacto. Si conoce la dirección de contacto adecuada, por favor contáctenos." @@ -4970,8 +5031,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra política de privacidad." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4985,8 +5046,12 @@ msgstr "Sitio web" msgid "We’ll get back to you as soon as we can." msgstr "Gracias por sus comentarios. ¡Nos pondremos en contacto con usted tan pronto como nos sea posible!" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Una vez editada" @@ -5006,14 +5071,10 @@ msgstr "Si el usuario debe completar este campo." msgid "Which problems do you want alerts about?" msgstr "¿Sobre cuales problemas quiere recibir alertas?" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "¿De cual reporte es un duplicado?" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "Tres fotos son suficientes." - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "¿Por qué detenerse ahí? Configure más alertas gratis." @@ -5034,15 +5095,19 @@ msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "¿Quieres recibir otro cuestionario en 4 semanas, recordándote que debes comprobar el estado?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuación hace que sea difícil de leer." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5051,20 +5116,19 @@ msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuac #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "SÍ" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Usted se está quejando de que la notificación fue innecesariamente moderada:" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "Ud. está desconectado" @@ -5072,7 +5136,7 @@ msgstr "Ud. está desconectado" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Estás denunciando la siguiente notificación por ser abusiva, contener información personal, o similar:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Estás denunciando la siguiente actualización por ser abusiva, contener información personal, o similar:" @@ -5085,7 +5149,7 @@ msgstr "Puede crear un nuevo reporte en la misma ubicación." msgid "You can view the problem on this site." msgstr "Usted puede ver el problema en este sitio." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Puede agregar email del usuario abusivo a la lista de abusones, que oculta de forma automática (y nunca envía) los informes que crean." @@ -5093,7 +5157,7 @@ msgstr "Puede agregar email del usuario abusivo a la lista de abusones, que ocul msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Puede ponerse en contacto con el soporte técnico en %s" @@ -5114,15 +5178,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Puede ayudarnos a encontrar una dirección de email de contacto para los problemas locales para %s y enviárnosla a %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Puede marcar un organismo como eliminado si no quiere que aparezca activo en este sitio." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Usted rechazó finalmente; por favor, rellene el formulario de arriba" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5188,7 +5252,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Necesita añadir organismos (como ayuntamiento o departamentos) para que el informe pueda ser enviado." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5213,9 +5277,10 @@ msgstr "Su cuenta" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Su email:" @@ -5231,10 +5296,10 @@ msgid "Your email or mobile" msgstr "Su email o número de celular/móvil" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Su información sólo será usada de acuerdo con nuestra política de privacidad" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Su nombre" @@ -5250,7 +5315,7 @@ msgstr "Su nombre está ahora oculto en todos sus reportes y actualizaciones." msgid "Your name has been hidden." msgstr "Su nombre ha sido ocultado." -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5273,7 +5338,7 @@ msgid "Your password should include %d or more characters." msgstr "Su contraseña debería incluir %d o más caracteres." #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Su número de teléfono" @@ -5298,7 +5363,7 @@ msgstr "Su token ha sido generado" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "Su actualización ha sido guardada para ser enviada cuando esté conectado nuevamente. " @@ -5315,25 +5380,24 @@ msgstr "Su código de verificación es %s" msgid "Yourself" msgstr "Usted" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "todas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "un administrador" @@ -5367,8 +5431,8 @@ msgstr "ej. ‘Bache de 50cm en la calle Ejemplo, cerca del buzón’" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "ej. ‘Este bache lleva al menos dos meses y...’" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "editar usuario" @@ -5377,12 +5441,12 @@ msgstr "editar usuario" msgid "from %s different users" msgstr "de %s usuarios diferentes" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "ultima actualización %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "menos de un minuto" @@ -5393,7 +5457,7 @@ msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "ninguna" @@ -5433,7 +5497,7 @@ msgstr "consignados inicialmente:" msgid "other areas:" msgstr "otras áreas:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "mostrar" @@ -5441,7 +5505,7 @@ msgstr "mostrar" msgid "sign out" msgstr "salir" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5458,19 +5522,19 @@ msgstr "no hay marcador porque el usuario no usó el mapa" msgid "this location" msgstr "esta ubicación" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "este tipo de problema local" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "hoy" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5486,11 +5550,11 @@ msgstr "El usuario es del mismo ayuntamiento que el problema - %d" msgid "user is problem owner" msgstr "El usuario es el propietario del problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "el usuario no está en la lista de abusos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "usuario eliminado de la lista de abusos" @@ -5499,35 +5563,35 @@ msgstr "usuario eliminado de la lista de abusos" msgid "ward" msgstr "barrio" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "%d dirección" msgstr[1] "%d direcciones" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5541,14 +5605,14 @@ msgid_plural "%d supporters" msgstr[0] "%d simpatizante" msgstr[1] "%d simpatizantes" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5618,7 +5682,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s notificaciones actualizadas" msgstr[1] "%s notificaciones actualizadas" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5639,7 +5703,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona." msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po index 575fa6f5a5f..331132ab903 100644 --- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/mysociety/teams/12067/es_DO/)\n" "Language: es_DO\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr " y " -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr " y " msgid " or " msgstr " o " -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d ediciones por %s" @@ -48,7 +48,7 @@ msgstr "%d ediciones por %s" msgid "%d to %d of %d" msgstr "%d a %d de %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -157,7 +157,7 @@ msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(no enviadas al ayuntamiento)" @@ -166,11 +166,11 @@ msgstr "(no enviadas al ayuntamiento)" msgid "(optional)" msgstr "(opcional)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(enviado a ambos)" @@ -179,13 +179,13 @@ msgstr "(enviado a ambos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Escoja una categoría --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -193,8 +193,8 @@ msgstr "" msgid "--Choose a template--" msgstr "--Elija una plantilla--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -209,11 +209,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -238,11 +238,11 @@ msgstr "No- confirmar mi actualización por email" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Nota: Este informe ha sido enviado y espera una acción. Cualquier cambio realizado no será pasado." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Nota: Este informe aún no se ha sido enviado por una acción. Cualquier cambio realizado podría no pasar." @@ -262,8 +262,8 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -273,13 +273,13 @@ msgstr "" "al que se puede enviar las notificaciones. Puedes asignar uno o más contactos a cada\n" "órgano para las diferentes categorías de problemas." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Añada un contacto usando el siguiente formulario." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Agregue un órgano" @@ -300,8 +300,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Agregar nueva categoría" @@ -316,27 +316,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Añadir a la lista de pre-seleccionados" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Añadir un usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Añadir/editar las categorias del problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Añadir/Editar las prioridades de respuesta" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Añadir/Editar las plantillas de respuesta" @@ -344,7 +344,7 @@ msgstr "Añadir/Editar las plantillas de respuesta" msgid "Added %s" msgstr "Añadido %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Añadir este reporte a tu lista de pre-seleccionados lo sacará de %s's la lista de pre-seleccionados." @@ -373,7 +373,6 @@ msgstr "Notificadme actualizaciones futuras" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -420,11 +419,15 @@ msgstr "Todas las notificaciones entre %s y %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -443,9 +446,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anónimo:" @@ -454,29 +457,29 @@ msgstr "Anónimo:" msgid "Another user" msgstr "Otro usuario" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "¿Está seguro(a) que quiere cancelar esta carga?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "¿Está seguro(a)?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Área cubierta" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Área:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Puesto que éste es un servidor de integración y %s es falsa, las notificaciones serán enviados al email del propio informante, no al contacto establecido para la categoría de problema." @@ -497,11 +500,11 @@ msgstr "Asignar a un órgano externo:" msgid "Assign to subdivision:" msgstr "Asigne a la subdivisión:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "Asignar usuarios a las áreas" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Asignado a %s" @@ -513,8 +516,8 @@ msgstr "Se devuelven hasta %d solicitudes en cada consulta. Dichas solicitudes s msgid "At the moment only searching for and looking at reports work." msgstr "Por el momento sólo funcionan la búsqueda y consulta de notificaciones." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "Usuarios del personal autorizado pueden estar asociados a las categorías en las cuales ellos operan." @@ -530,7 +533,7 @@ msgstr "Respuesta automática:" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -551,11 +554,11 @@ msgstr "Evitar información personal y las placas de matrícula de los carros" msgid "Awaiting moderation" msgstr "En espera de revisión" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Atras" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Volver a todos los informes" @@ -563,10 +566,10 @@ msgstr "Volver a todos los informes" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -575,17 +578,17 @@ msgstr "Órganos administrativos" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Órgano administrativo" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Órgano administrativo:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -601,7 +604,7 @@ msgstr "¿No puedes encontrar nuestro email? Busque en su folder de email basura msgid "Can't see the map? Skip this step" msgstr "¿No puedes ver el mapa? Salte este paso" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -612,15 +615,15 @@ msgstr "Categorías" msgid "Categories:" msgstr "Categorías:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -633,7 +636,7 @@ msgstr "Categoría" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categoría cambiada de ‘%s’ a ‘%s’" @@ -643,9 +646,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Ratio de arreglo de problemas > 4 semanas" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -672,11 +675,11 @@ msgstr "Cambiar contraseña" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "Marcar la inspección requerida si se reporta en esta categoríadebe ser inspeccionada antes de ser enviada." -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -694,7 +697,7 @@ msgstr "" "no hay mayor interés en ser desplegados. En el Reino Unido, hemos utilizado esto para servicios como requerir un\n" "basurero extra en una dirección específica" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -702,11 +705,11 @@ msgstr "" "Elegir un nombre de categoria que tenga sentido para el público (por ejemplo, \"baches\", \"alumbrado público\") y que sea también útil\n" "para el organismo administrativo. Las categorías aparecerán en un menú desplegable al notificar un problema." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "Elija otro" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "Eliminar datos sin conexión" @@ -738,9 +741,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -784,17 +791,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuración" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Confirmar" @@ -815,9 +822,9 @@ msgstr "Como alternativa confirme por email, para lo cual tendrá que indicar un msgid "Confirmation" msgstr "Confirmación" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Confirmado" @@ -847,7 +854,11 @@ msgstr "Contactar con el equipo" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -856,12 +867,12 @@ msgstr "" msgid "Coordinates:" msgstr "Coordenadas:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "No se pudo encontrar el usuario" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "No se pudo consultar la ubicación" @@ -869,9 +880,11 @@ msgstr "No se pudo consultar la ubicación" msgid "Council" msgstr "Ayuntamiento" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Contactos del ayuntamiento para %s" @@ -900,8 +913,8 @@ msgstr "Crear una notificación" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Crear una categoría" @@ -909,15 +922,15 @@ msgstr "Crear una categoría" msgid "Create priority" msgstr "Crear prioridad" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "Crear informes/actualizaciones como ayuntamiento" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "Crear informes/actualizaciones en nombre del usuario" @@ -931,7 +944,7 @@ msgstr "Crear plantillas" msgid "Created" msgstr "Creado" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -954,12 +967,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "No se han creado organismos aún." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Cliente imposible de contactar" @@ -987,32 +1000,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "Tipo de defecto" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Eliminar plantilla" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Eliminado" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "Describe el motivo de la moderación" @@ -1028,18 +1041,18 @@ msgstr "Descripción" msgid "Description:" msgstr "Descripción:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detalles" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1050,7 +1063,7 @@ msgstr "Detalles:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Transferido" @@ -1059,24 +1072,24 @@ msgstr "Transferido" msgid "Didn't use map" msgstr "No usó el mapa" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Ranking de premios a la constancia" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "Desechar cambios" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "No enviar alertas por email en los comentarios recopilados para el creador del problema" @@ -1085,7 +1098,7 @@ msgstr "No enviar alertas por email en los comentarios recopilados para el cread msgid "Do you have a %s password?" msgstr "¿Tiene una contraseña %s?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1093,7 +1106,7 @@ msgstr "" msgid "Don’t know" msgstr "No lo sé" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "¿No te gustan los formularios?" @@ -1101,19 +1114,19 @@ msgstr "¿No te gustan los formularios?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Deslice y deje las fotos aquí o haga clic para subir" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1124,8 +1137,8 @@ msgstr "" "Diferentes categorías pueden tener el mismo contacto.\n" "Esto significa que puede agregar muchas categorías incluso si tiene un solo contacto para el órgano." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "Falso este/Falso norte:" @@ -1133,23 +1146,23 @@ msgstr "Falso este/Falso norte:" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Editar" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Editar los detalles del órgano administrativo" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "Editar los permisos de otros usuarios" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Editar la categoría del informe" @@ -1157,15 +1170,15 @@ msgstr "Editar la categoría del informe" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Editar la prioridad del informe" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Editar los informes" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1188,28 +1201,28 @@ msgstr "Editando el problema %d" msgid "Editing update %d" msgstr "Editando la actualización %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Editando el usuario %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Editor" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email:" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1238,37 +1251,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Email:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1276,8 +1289,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1289,8 +1302,8 @@ msgstr "" "Para obtener más información, consulte\n" "este documento." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1300,8 +1313,8 @@ msgstr "" "tienen diferentes vías para recibir (y enviar) actualizaciones. Por ejemplo, si los informes para algunas categorías de \n" "incidencia deben ser enviadas por correo electrónico, mientras que otros pueden ser enviados a través Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1309,7 +1322,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Punto final" @@ -1331,10 +1344,6 @@ msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área msgid "Enter a nearby street name and area" msgstr "Introduzca el nombre de una calle cercana" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Introduzca detalles del problema" @@ -1348,13 +1357,13 @@ msgstr "Introduzca detalles del problema" msgid "Error" msgstr "Error" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Todo" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Ejemplo de código postal %s" @@ -1366,11 +1375,11 @@ msgstr "Ejemplos:" msgid "Existing category" msgstr "Categoría existente" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1387,7 +1396,7 @@ msgstr "" msgid "External ID" msgstr "ID externo" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "URL Externo" @@ -1408,25 +1417,25 @@ msgstr "" msgid "External team" msgstr "Equipo externo" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Datos adicionales:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Detalles adicionales" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1449,11 +1458,12 @@ msgstr "" msgid "Filter report list" msgstr "Filtrar lista de informes" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Primera vez" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Arreglar esto eligiendo un área cubierta en el formulario Editar detalles del organismo a continuación." @@ -1473,9 +1483,9 @@ msgstr "Arreglado - Ayuntamiento" msgid "Fixed - User" msgstr "Arreglado - Usuario" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Marcar como borrado" @@ -1483,8 +1493,8 @@ msgstr "Marcar como borrado" msgid "Flag user" msgstr "Marca usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Marcado" @@ -1492,7 +1502,7 @@ msgstr "Marcado" msgid "Flagged reports and users" msgstr "Señalizar informes y usuarios" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Los usuarios marcados se listan en página demarcados" @@ -1501,7 +1511,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Las capacidades de los \"usuarios marcados\" no se limitan de ninguna manera. Es solo una lista de usuarios que han sido marcado para observación." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Marcado:" @@ -1517,7 +1527,7 @@ msgstr "Para mejores resultados incluya una toma en close-up y una abierta" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Para más información, vea Cómo FixMyStreet usa Mapit." @@ -1531,11 +1541,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "¿Olvidó su contraseña?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Reenviado al organismo administrativo externo" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "Deseo reenviado al organismo administrativo externo" @@ -1551,6 +1561,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Recibe actualizaciones" @@ -1581,9 +1593,9 @@ msgstr "¡Nos alegra saber que ha sido arreglado!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1593,7 +1605,7 @@ msgstr "Ir" msgid "Going to send questionnaire?" msgstr "¿Va a enviar cuestionario?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "Permitir el acceso al administrador" @@ -1601,7 +1613,7 @@ msgstr "Permitir el acceso al administrador" msgid "Graph of problem creation by status over time" msgstr "Gráfico temporal de creación problemas por estado" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1652,11 +1664,11 @@ msgstr "Oculto" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "Ocultar el reporte entero" @@ -1677,9 +1689,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Ocultar marcadores" @@ -1696,11 +1708,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Historial" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Inicio" @@ -1708,7 +1720,7 @@ msgstr "Inicio" msgid "How to report a problem" msgstr "Cómo notificar un problema" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "¿Cómo enviar informes exitosos?" @@ -1730,7 +1742,7 @@ msgstr "No se ha podido localizar su problema en la base de datos.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1739,8 +1751,8 @@ msgstr "No se ha podido localizar su problema en la base de datos.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1764,7 +1776,7 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1772,7 +1784,7 @@ msgstr "" "Si dos o más organismos tienen la misma ubicación, CuidoMiCiudad combina categorías de notificaciones idénticas en una sola entrada en\n" "el menú. Asegúrese de que utiliza el mismo nombre categoría en ambos órganos si desea que sean combinadas." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1784,6 +1796,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Si usted consigue algo más de información sobre el estado del problema, por favor regrese a esta web y añádale una actualización." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Si quiere que esta prioridad sea una opción para categorías específicas, elíjalas aquí. Como valor predeterminado se mostrarán todas las categorías." @@ -1813,34 +1829,34 @@ msgstr "" "Si desea abandonar la actualización pública del problema, por favor introdúzcalo aquí\n" "(por favor, tenga en cuenta que no será enviado al ayuntamiento)." -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Si utiliza un método de envío distinto del email, introduzca el ID de servicio (Open311) o identificador equivalente aquí." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID incorrecto" @@ -1848,7 +1864,7 @@ msgstr "ID incorrecto" msgid "Illegal feed selection" msgstr "Selección de listado incorrecta" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1860,7 +1876,7 @@ msgstr "¿En tabla de abusones?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Los siguientes atributos, que no forman parte de la especificación Open311 v2, son adicionalmente devueltos: agency_sent_datetime, title (también se devuelve como parte de la descripción), interface_used, comment_count, requestor_name (solo si el solicitante permitió que el nombre que se mostrará en el sitio)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1876,15 +1892,15 @@ msgstr "Incluir datos del notificador" msgid "Incorrect has_photo value \"%s\"" msgstr "Valor incorrecto para has_photo \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "Inspección requerida" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "Dar instrucciones a los contratistas para que solucionen los problemas" @@ -1892,7 +1908,7 @@ msgstr "Dar instrucciones a los contratistas para que solucionen los problemas" msgid "Internal notes" msgstr "Notas internas" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "Fallo de Internet" @@ -1900,12 +1916,12 @@ msgstr "Fallo de Internet" msgid "Invalid agency_responsible value %s" msgstr "Valor inválido para agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Especificado un formato no válido %s." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "Ubicación equivocada. Una nueva ubicación debe estar bajo la protección del mismo ayuntamiento." @@ -1926,7 +1942,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1939,8 +1955,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Último editor" @@ -1956,17 +1972,17 @@ msgstr "Última actualización:" msgid "Last update:" msgstr "Última actualización:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "Latitud/Longitud:" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "Menos recientemente actualizado" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Deje en blanco si todos las notificaciones a este órgano administrativo utilizan el mismo método de envío (e.g., \"%s\")." @@ -1974,7 +1990,7 @@ msgstr "Deje en blanco si todos las notificaciones a este órgano administrativo msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Listar todos los problemas notificados" @@ -2018,16 +2034,16 @@ msgstr "Iniciar sesión con Facebook" msgid "Log in with Twitter" msgstr "Iniciar sesión con Twitter" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Iniciar sesión con email" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2035,23 +2051,23 @@ msgstr "" msgid "Look up" msgstr "Buscar" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "MAPA" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "Administrar los pre-seleccionados" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr " Mapa" @@ -2059,15 +2075,15 @@ msgstr " Mapa" msgid "Mark as sent" msgstr "Marcado como enviado" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Señalar como marcados aquellos usuarios cuyo comportamiento desea observar." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "Marcar los detalles del problema" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Mensaje:" @@ -2083,19 +2099,19 @@ msgstr "Mensaje al organismo administrativo externo:" msgid "Missing bodies:" msgstr "Organismos administrativos perdidos:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Falta jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Moderar" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "Moderar los detalles del informe" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Moderar este informe" @@ -2103,10 +2119,10 @@ msgstr "Moderar este informe" msgid "Moderate this update" msgstr "Moderar este actualización" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "Moderado por %s a %s" @@ -2124,12 +2140,12 @@ msgstr "" msgid "Month" msgstr "Mes" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Lo más comentado" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2141,11 +2157,11 @@ msgstr "Lo más comentado" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2154,7 +2170,7 @@ msgstr "Nombre" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Nombre:" @@ -2164,11 +2180,11 @@ msgstr "Nombre:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Navegue a este problema" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2180,7 +2196,7 @@ msgstr "Nombre de la calle más cercana al marcador colocado en el mapa (se gene msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Código Postal más cercano al marcador colocado en el mapa (generado automáticamente): %s (%sm de distancia)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Camino más cercano al marcador colocado en el mapa (generado automáticamente por Bing Maps): %s" @@ -2206,11 +2222,11 @@ msgstr "¡Casi hemos terminado! Lea su email…" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Nuevo organismo añadido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Añadida nueva categoría de contactos" @@ -2246,23 +2262,23 @@ msgstr "" msgid "New priority" msgstr "Prioridad nueva" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2270,7 +2286,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Nuevos reportes en {{COUNCIL}} para el barrio {{WARD}} en CuidoMiCiudad" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2306,11 +2322,11 @@ msgstr "Nuevo estado" msgid "New template" msgstr "Plantilla nueva" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Lo más reciente" @@ -2322,10 +2338,10 @@ msgstr "Siguiente" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2333,11 +2349,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "No" @@ -2345,11 +2360,7 @@ msgstr "No" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Sin área" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Sin órgano administrativo" @@ -2357,7 +2368,7 @@ msgstr "Sin órgano administrativo" msgid "No council selected" msgstr "Ningún ayuntamiento seleccionado" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "No se han hecho ediciones aún." @@ -2374,11 +2385,11 @@ msgstr "No se encuentran usuarios marcados" msgid "No further updates" msgstr "No hay más actualizaciones" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2386,12 +2397,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Ningún resultado devuelto" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2410,8 +2421,8 @@ msgstr "No hay seguidores" msgid "None" msgstr "Nada" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." @@ -2419,8 +2430,8 @@ msgstr "" "Usuarios normales (públicos) no deberán ser asociados con cualquier área.
\n" "Usuarios del personal autorizado pueden ser asociados con el área en la cual operan." -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2444,13 +2455,13 @@ msgstr "No notificado anteriormente" msgid "Not reported to council" msgstr "No comunicado al ayuntamiento" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Nota" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Nota:" @@ -2474,15 +2485,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "Datos sin conexión eliminados" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2490,16 +2501,16 @@ msgstr "" msgid "Old state" msgstr "Estado antiguo" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Lo más antiguo" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2510,7 +2521,7 @@ msgstr "" msgid "Open" msgstr "Abierto" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "Código Open311 API " @@ -2518,7 +2529,7 @@ msgstr "Código Open311 API " msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 para el servidor CuidoMiCiudad" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "Jurisdicción Open311 " @@ -2550,17 +2561,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Otros" @@ -2585,8 +2596,8 @@ msgstr "Propietario" msgid "Page Not Found" msgstr "Página no encontrada" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Padre" @@ -2600,19 +2611,19 @@ msgstr "Parcial" msgid "Password (optional)" msgstr "Contraseña (opcional)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Enlace permanente" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Licencias:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2632,17 +2643,16 @@ msgstr "Número de teléfono (opcional)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Teléfono:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2653,6 +2663,7 @@ msgstr "Teléfono:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2667,7 +2678,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "Foto es obligatoria." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Foto es obligatoria" @@ -2696,11 +2707,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Coloque el marcador en el mapa" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Por favor, sea cortés, conciso y vaya al grano." @@ -2717,7 +2732,7 @@ msgstr "Por favor, comprueba la contraseña e inténtalo de nuevo" msgid "Please check your email address is correct" msgstr "Por favor, compruebe que su dirección de email es correcta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2725,11 +2740,11 @@ msgstr "Por favor, compruebe que su dirección de email es correcta" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Por favor, elija una categoría" @@ -2738,8 +2753,9 @@ msgstr "Por favor, elija una categoría" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Por favor, corrija los errores a continuación" @@ -2755,13 +2771,13 @@ msgstr "Por favor, no reporte los problemas a través de este msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Por favor notifique incidencias relevantes y no abuse; abusando de su ayuntamiento degrada su capacidad de servicio a toda la ciudadanía." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Por favor escriba su mensaje." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2769,90 +2785,90 @@ msgstr "Por favor escriba su mensaje." msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Por favor, indique un nombre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "Por favor, indique un nombre para este organismo" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Por favor, introduzca una contraseña" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Por favor, introduzca un título" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Por favor, introduce una dirección de email válida" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Por favor, introduce una dirección de email válida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Por favor, describa los detalles más relevantes" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Por favor, introduzca su dirección de email" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Por favor, indique su nombre" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Por favor escriba su nombre completo, ya que los ayuntamientos necesitan esta información. Si usted NO desea que su nombre aparecerá en la página, desactive la casilla de abajo" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Por favor, introduzca su nombre" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Por favor, introduzca su número de telefono" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Introduzca su segundo nombre" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Por favor, introduzca su título" @@ -2880,7 +2896,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique si le gustaría recibir algún otro cuestionario" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2906,11 +2922,11 @@ msgstr "Por favor, tenga en cuenta que su actualización no ha sido aún msgid "Please note:" msgstr "Por favor, tenga en cuenta:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "Por favor, proveer una actualización pública para este reporte." @@ -2946,16 +2962,16 @@ msgstr "Por favor, indique si el problema se ha solucionado" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "Por favor, suba solo una imagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Por favor, escriba un mensaje" @@ -2991,12 +3007,12 @@ msgstr "Con la tecnología de reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "Los informes serán automáticamente enviados sin necesidad de verificar si la reputación del usuario está al nivel o más de este valor. Ajustar a strong>0 si todos los informes deben ser verificados sí o sí. " -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "Umbral de reputación" @@ -3498,20 +3528,20 @@ msgstr "Plantillas de respuesta" msgid "Response Templates for %s" msgstr "Plantillas de respuesta por %s" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "Volver al texto original" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "Volver al texto original" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "Volver al titulo original" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "¿Es correcto el lugar?" @@ -3523,15 +3553,15 @@ msgstr "Operador responsable de este camino (derivado del número de referencia msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador responsable de este camino (de OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rotar a la izquierda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3542,23 +3572,23 @@ msgstr "Rotar a la derecha" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rotar esta foto eliminará los cambios no guardados al informe." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satélite" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Guardar cambios" @@ -3567,12 +3597,12 @@ msgstr "Guardar cambios" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "Guardar con una actualización pública" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "Guardando reportes sin conexión" @@ -3582,7 +3612,8 @@ msgstr "Guardando reportes sin conexión" msgid "Search Reports" msgstr "Buscar Notificaciones" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Buscar Usuarios" @@ -3591,7 +3622,7 @@ msgid "Search reports" msgstr "Buscar informes" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Buscar:" @@ -3601,7 +3632,7 @@ msgstr "Buscar:" msgid "Searching found no reports." msgstr "La búsqueda no encontró notificaciones." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "La búsqueda no encontró usuarios." @@ -3617,17 +3648,18 @@ msgstr "" msgid "See our privacy policy" msgstr "Ver nuestra política de privacidad" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Selecciona un órgano administrativo" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Seleccione un área" @@ -3647,15 +3679,15 @@ msgstr "" msgid "Select:" msgstr "Seleccionar:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "Enviar estados Open311 extendidos con actualizaciones de pedidos de servicio" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3664,7 +3696,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "Devolver el informe" @@ -3691,7 +3723,7 @@ msgstr "Servicio:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "Ajustar a mi ubicación actual" @@ -3700,9 +3732,9 @@ msgid "Share" msgstr "Compartir" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "Pre-seleccionados" @@ -3710,15 +3742,15 @@ msgstr "Pre-seleccionados" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Entre los pre-seleccionados" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "Pre-seleecionados por %s" @@ -3730,7 +3762,7 @@ msgstr "Mostrar foto" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Mostrar mi nombre públicamente" @@ -3742,21 +3774,21 @@ msgstr "Mostrar el nombre públicamente" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "Mostrar foto" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Mostrar marcadores" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "Mostrar el nombre del reportero" @@ -3799,8 +3831,8 @@ msgstr "Salir" msgid "Some categories may require additional information." msgstr "Algunas categorías pueden requerir información adicional." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3817,6 +3849,14 @@ msgstr "Algunas fotos de notificaciones recientes" msgid "Some text to localize" msgstr "Algún texto para localizar" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Lo sentimos, ése parece ser un código postal dependiente de La Corona, que no soportamos." @@ -3834,7 +3874,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Lo sentimos, hubo un error confirmando su notificación." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3856,7 +3896,7 @@ msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Lo sentimos, no pudimos guardar su(s) imagen(es), por favor inténtelo de nuevo." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3866,15 +3906,15 @@ msgstr "Disculpa, no tenemos una buena conexión de internet para grabar este p msgid "Sorry, you don't have permission to do that." msgstr "Lo sentimos, no tiene permiso para hacer eso." -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Seleccionado por" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "Usuarios del personal tienen permiso para iniciar sesión al administrador." -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "Personal:" @@ -3882,31 +3922,32 @@ msgstr "Personal:" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3919,14 +3960,14 @@ msgstr "" msgid "State:" msgstr "Estado/Prov.:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3942,7 +3983,7 @@ msgid "Status" msgstr "Estado" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3955,7 +3996,7 @@ msgstr "Vista de calle" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3963,12 +4004,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Subdivisión/Órgano" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Título" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Título:" @@ -3986,7 +4027,7 @@ msgstr "Enviar" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -4007,7 +4048,8 @@ msgstr "Enviado" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Suscribirse" @@ -4015,21 +4057,29 @@ msgstr "Suscribirse" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "Resuma el problema" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "Resuma sus cambios" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4049,11 +4099,11 @@ msgstr "Resumen de notificaciones" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "Súperusuario:" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "Los súperusuarios tienen el permiso de realizar todas las acciones dentro del administrador." @@ -4071,8 +4121,8 @@ msgstr "" msgid "Template «%s»" msgstr "Plantilla «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4082,7 +4132,7 @@ msgstr "Plantillas" msgid "Text" msgstr "Texto" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Versión solo texto" @@ -4126,7 +4176,7 @@ msgstr "¡Gracias, nos alegra saber que fue arreglado! ¿Podría decirnos si hab msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuevo." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Esa localización no parece estar cubierta por un ayuntamiento, tal vez esté en alta mar o fuera del país. Por favor, inténtelo de nuevo." @@ -4140,11 +4190,11 @@ msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo." msgid "That postcode was not recognised, sorry." msgstr "Ese código postal no fue reconocido, lo siento." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "El problema se ha marcado como enviado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "El problema ahora será reenviado." @@ -4156,23 +4206,23 @@ msgstr "Esa notificación no se puede ver en %s." msgid "That report has been removed from FixMyStreet." msgstr "Esa notificación ha sido eliminada de CuidoMiCiudad." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4180,8 +4230,8 @@ msgstr "" "El email indica dónde serán enviadas las notificaciones de esta categoría.\n" "Otras categorías de este mismo órgano administrativo podrían usar el mismo email." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4189,24 +4239,24 @@ msgstr "" "El destino es la URL del servicio al que CuidoMiCiudad se conectará \n" "cuando envíe notificaciones al organismo administrativo." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "La jurisdicción solo es necesaria si los límites incluyen a más de un municipio. Si el organismo administrativo funciona solo con sus propios límites puede dejar en blanco esto." -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4218,8 +4268,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "El atributo Open311 v2 agency_responsible se utiliza para listar las administraciones que han recibido la notificación de problemas, que no es exactamente la forma en que se define dicho atributo en la especificación Open311 v2." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4236,12 +4286,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "El ayuntamiento necesita la mayor cantidad de detalles posibles para atender su notificación. Por favor, describa la ubicación exacta del problema (e.g. \"sobre tal o cual pared\"), en qué consiste éste, el tiempo que lleva ahí, una descripción y si es posible también una foto que permita localizarlo, etc." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Los premios a la responsabilidad muestran la actividad de los editores (quién ha editado más registros)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "El error fue: %s" @@ -4287,7 +4337,7 @@ msgstr "Últimos problemas dentro de los límites de {{NAME}} notificados por lo msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "El enlace podría haber caducado, o quizá usted no’ lo copió y pegó correctamente." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "La lista de áreas disponibles está siendo ofrecida por el servicio MapIt en %s." @@ -4308,20 +4358,20 @@ msgstr "La URL solicitada, '%s', no fue encontrada en el servidor" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "El usuario no pudo situar el problema en el mapa, salvo para ver el área alrededor de la localización que introdujo." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4335,7 +4385,11 @@ msgstr "" msgid "There are no reports to show." msgstr "No hay ninguna notificación que mostrar." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4343,8 +4397,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por favor, inténtelo de nuevo más tarde." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde." @@ -4366,7 +4420,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Hubo problemas con su notificación. Por favor, vea más abajo." @@ -4383,8 +4437,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4397,7 +4451,7 @@ msgstr "" "Para obtener más información sobre Open311, consulte\n" "este documento." -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4415,7 +4469,7 @@ msgstr "Estos serán enviados al %s y también publicados onlin msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Esta implementación de la API es un trabajo aún en progreso y no es estable todavía. Se cambiará sin advertencias en el futuro." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4425,12 +4479,12 @@ msgstr "" "En consecuencia, ninguna de sus categorías aparecerá en el menú desplegable de categorías cuando los usuarios envíen incidencias.\n" "Actualmente, los usuarios no pueden informar de problemas a este organismo." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Este órgano no tiene contactos. Esto significa que en la actualidad las incidencias notificadas a este organismo no son enviadas." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4438,18 +4492,17 @@ msgstr "" "A este organismo sólo se enviarán informes de problemas que se encuentran en el área cubierta.\n" "Un organismo no recibirá ningún informe salvo que represente al menos un área." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Este correo electrónico ha sido enviado a los dos ayuntamientos que cubren la ubicación del problema, ya que el usuario no lo categorizó. Por favor, haga caso omiso del mismo si usted no es el organismo administrativo responsable de este problema, o háganos saber qué clase de problema es para que lo podamos añadir a nuestro sistema." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Este correo electrónico ha sido enviado a varios consejos que cubren la ubicación del problema, pues la categoría de problema seleccionada por el usuario se proporciona para todos ellos. Por favor, si usted no pertenece al órgano administrativo responsable de resolver esta incidencia haga caso omiso de este mensaje." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Esta información es necesaria" @@ -4466,7 +4519,11 @@ msgstr "Este es un sitio para desarrolladores, las cosas podrían romperse en cu msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4482,12 +4539,16 @@ msgstr "Este problema no se ha arreglado" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "Ese reporte es duplicado. Por favor, actualizar el reporte original:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Esta notificación está pendiente de moderación." @@ -4508,7 +4569,7 @@ msgstr "Esta notificación está marcada como abierta." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Esta página web también contiene una foto del problema, proporcionada por el usuario." @@ -4519,7 +4580,7 @@ msgstr "Esta página web también contiene una foto del problema, proporcionada msgid "Time spent (in minutes):" msgstr "Tiempo invertido (en minutos):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Cronología" @@ -4557,7 +4618,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Para ver un mapa de la ubicación precisa de este problema" @@ -4586,34 +4647,34 @@ msgstr "" msgid "Total" msgstr "Total" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "¿Se necesita administración del tráfico?" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "Confiables por los organismos administrativos:" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "Acreditado para hacer informes que no requieren inspección" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "Acreditado:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Inténtelo de nuevo" @@ -4632,16 +4693,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4659,7 +4720,7 @@ msgstr "Tipo de alerta desconocida" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Error desconocido" @@ -4672,7 +4733,7 @@ msgstr "Error desconocido" msgid "Unknown problem ID" msgstr "ID de problema desconocido" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4685,7 +4746,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Actualizar" @@ -4694,16 +4755,16 @@ msgstr "Actualizar" msgid "Update %s created for problem %d; by %s" msgstr "Actualización %s creada para el problema %d; por %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "La actualización de abajo fue añadida de forma anónima en %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "La actualización de abajo fue añadida por %s en %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Actualizar órgano" @@ -4728,7 +4789,7 @@ msgstr "La actualización marcó el problema como arreglado" msgid "Update reopened problem" msgstr "La actualización reabrió el problema" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Actualización de estados" @@ -4746,14 +4807,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "¡Actualizado!" @@ -4778,12 +4839,12 @@ msgstr "Actualizaciones en {{title}}" msgid "Updates to this problem, %s" msgstr "Actualizaciones a este problema, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4793,15 +4854,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "Abrir la extension Open311 de envío de actualización" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "Use este campo para registrar detalles que solo se muestran en el administrador. Estas entradas no son públicas y no se enviarán al organismo administrativo." @@ -4810,48 +4871,48 @@ msgstr "Use este campo para registrar detalles que solo se muestran en el admini msgid "Used map" msgstr "Mapa usado" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "ID de usuario a quien atribuir los comentarios obtenidos" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Usuario marcado" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4860,20 +4921,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Usuarios" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "Los usuarios pueden realizar las siguientes acciones dentro de sus organismos administrativos o áreas asignadas. " -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Valores actualizados" @@ -4907,12 +4968,12 @@ msgstr "Ver notificaciones por barrio" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Visualizando una ubicación" @@ -4947,7 +5008,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "Necesitamos su dirección de email, por favor escríbala debajo." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Somos conscientes de este problema podría ser responsabilidad de %s; sin embargo, actualmente no disponemos de sus datos de contacto. Si conoce la dirección de contacto adecuada, por favor contáctenos." @@ -4962,8 +5023,8 @@ msgstr "Selecciona uno de los enlaces proporcionados, y si aún no encuentras la #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra política de privacidad." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4977,8 +5038,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "Gracias por sus comentarios. ¡Nos pondremos en contacto con usted tan pronto como nos sea posible!" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Una vez editada" @@ -4998,14 +5063,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "¿Ese reporte es un reporte duplicado de qué reporte?" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "¡Espere! Tres fotos son suficientes." - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "¿Por qué detenerse ahí? Configure más alertas gratis." @@ -5026,15 +5087,19 @@ msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "¿Quieres recibir otro cuestionario en 4 semanas, recordándote que debes comprobar el estado?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuación hace que sea difícil de leer." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5043,20 +5108,19 @@ msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuac #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "SÍ" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Usted se está quejando de que la notificación fue innecesariamente moderada:" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "Está sin conexion" @@ -5064,7 +5128,7 @@ msgstr "Está sin conexion" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Estás denunciando la siguiente notificación por ser abusiva, contener información personal, o similar:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Estás denunciando la siguiente actualización por ser abusiva, contener información personal, o similar:" @@ -5077,7 +5141,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Usted puede ver el problema en este sitio." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Puede agregar email del usuario abusivo a la lista de abusones, que oculta de forma automática (y nunca envía) los informes que crean." @@ -5085,7 +5149,7 @@ msgstr "Puede agregar email del usuario abusivo a la lista de abusones, que ocul msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Puede ponerse en contacto con el soporte técnico en %s" @@ -5106,15 +5170,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Puede ayudarnos a encontrar una dirección de email de contacto para los problemas locales para %s y enviárnosla a %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Puede marcar un organismo como eliminado si no quiere que aparezca activo en este sitio." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Usted rechazó finalmente; por favor, rellene el formulario de arriba" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5180,7 +5244,7 @@ msgstr "No ha’ pre-seleccionado ningún informe aún." msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Necesita añadir organismos (como ayuntamiento o departamentos) para que el informe pueda ser enviado." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5205,9 +5269,10 @@ msgstr "Su cuenta" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Su email:" @@ -5223,10 +5288,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Su información sólo será usada de acuerdo con nuestra política de privacidad" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Su nombre" @@ -5242,7 +5307,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5265,7 +5330,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Su número de teléfono" @@ -5290,7 +5355,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "Su reporte está guardado para subir cuando tenga una conexión internet." @@ -5307,25 +5372,24 @@ msgstr "" msgid "Yourself" msgstr "Usted mismo" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "todo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5359,8 +5423,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "editar usuario" @@ -5369,12 +5433,12 @@ msgstr "editar usuario" msgid "from %s different users" msgstr "de %s usuarios diferentes" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "ultima actualización %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "menos de un minuto" @@ -5385,7 +5449,7 @@ msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "nada" @@ -5425,7 +5489,7 @@ msgstr "consignados inicialmente:" msgid "other areas:" msgstr "otras áreas:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5433,7 +5497,7 @@ msgstr "" msgid "sign out" msgstr "salir" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5450,19 +5514,19 @@ msgstr "no hay marcador porque el usuario no usó el mapa" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "este tipo de problema local" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "hoy" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5478,11 +5542,11 @@ msgstr "El usuario es del mismo ayuntamiento que el problema - %d" msgid "user is problem owner" msgstr "El usuario es el propietario del problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5491,35 +5555,35 @@ msgstr "" msgid "ward" msgstr "barrio" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5533,14 +5597,14 @@ msgid_plural "%d supporters" msgstr[0] "%d simpatizante" msgstr[1] "%d simpatizantes" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5610,7 +5674,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s notificaciones actualizadas" msgstr[1] "%s notificaciones actualizadas" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5631,7 +5695,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona." msgstr[1] "Todavía no tenemos información de qué ayuntamientos cubren este área." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po index 7235a954712..c42395e699a 100644 --- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: French (France) (https://www.transifex.com/mysociety/teams/12067/fr_FR/)\n" "Language: fr_FR\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr " et " -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr " et " msgid " or " msgstr " ou " -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "%d caractères maximum" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d changements par %s" @@ -48,7 +48,7 @@ msgstr "%d changements par %s" msgid "%d to %d of %d" msgstr "de %d à %d de %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "%d les utilisateurs existent déjà" @@ -160,7 +160,7 @@ msgstr "(comme des graffitis, immondices, trottoirs abimés ou éclairage public msgid "(no longer exists)" msgstr "(n'existe plus)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(non signalé à l’administration)" @@ -169,11 +169,11 @@ msgstr "(non signalé à l’administration)" msgid "(optional)" msgstr "(facultatif)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "(Envoyé á tous)" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(envoyé aux deux)" @@ -182,13 +182,13 @@ msgstr "(envoyé aux deux)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(nous avons également des flux RSS pour les problèmes internes%s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Choisissez une catégorie --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "- Choisissez une option -" @@ -196,8 +196,8 @@ msgstr "- Choisissez une option -" msgid "--Choose a template--" msgstr "--Choisissez un modèle--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -212,11 +212,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "

Rapports, statistiques et actions pour

%s

" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr " %s les rapports %s" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%senregistré." @@ -241,11 +241,11 @@ msgstr "Non, laissez-moi confirmer ma mise à jour par email :" msgid "No Let me confirm my update by email/text" msgstr "Non Laissez-moi confirmer ma mise à jour par email/texte" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr " Remarque: Ce rapport a été envoyé pour action. Toutes les modifications apportées ne seront pas transmises." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr " Remarque: Ce rapport n'a pas encore été envoyé pour action. Toutes les modifications apportées ne peuvent pas être transmises." @@ -265,8 +265,8 @@ msgstr "Activer l’authentification à deux facteurs" msgid "Add" msgstr "Ajouter" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -276,13 +276,13 @@ msgstr "" " ou les rapports de problèmes peuvent être envoyés. Vous pouvez ajouter un ou plusieurs contact (pour differentes\n" " catégories de problèmes) à chaque body." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Ajouter un contact en utilisant le formulaire ci-dessous." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Ajouter un interlocuteur" @@ -303,8 +303,8 @@ msgstr "Ajouter un champ" msgid "Add fixed state" msgstr "Ajouter un état fixe" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Ajouter une nouvelle catégorie" @@ -319,27 +319,27 @@ msgstr "Ajouter un táláphone" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Ajouter à la liste" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Ajouter un utilisateur" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Ajouter/modifier des catégories de problèmes" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Ajouter/modifier les priorités de réponse" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Ajouter/modifier des modèles de réponse" @@ -347,7 +347,7 @@ msgstr "Ajouter/modifier des modèles de réponse" msgid "Added %s" msgstr "Ajouté %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "L'ajout de ce rapport à votre liste va le supprimer de la liste %s’s." @@ -376,7 +376,6 @@ msgstr "M'alerter de futures mises à jour" msgid "Alerts:" msgstr "Alertes:" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -423,11 +422,15 @@ msgstr "Tous les rapports entre %s et %s" msgid "All time" msgstr "Tout le temps" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "Alternativement, nous pouvons cacher votre nom sur tous vos rapports et mises à jour sur le site:" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "Toujours chercher tous les problèmes" @@ -446,9 +449,9 @@ msgid "Anonymous user" msgstr "Utilisateur anonyme" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonyme :" @@ -457,29 +460,29 @@ msgstr "Anonyme :" msgid "Another user" msgstr "un autre utilisateur" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Êtes-vous sûr de vouloir annuler cet envoi ?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Êtes-vous sûr ?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Zone couverte" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Région:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Comme ceci est un site de développement et %s est un test, les rapports produits sur ce site seront envoyés au gestionnaire du problème FixMyStreet et non au contact de l'administration indiqué pour la catégorie choisie." @@ -500,11 +503,11 @@ msgstr "Affecté à un \"interlocuteur\" externe:" msgid "Assign to subdivision:" msgstr "Affecté à la subdivision:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "Affecter des utilisateurs aux zones" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Affecté à %s" @@ -516,8 +519,8 @@ msgstr "Un maximum de %d requètes sont renvoyées pour chaque tentative. Les re msgid "At the moment only searching for and looking at reports work." msgstr "Pour le moment, seul la recherche et la consultation de rapports sont supportés." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "Les utilisateurs autorisés peuvent être associés aux catégories sur lesquelles ils interviennent." @@ -533,7 +536,7 @@ msgstr "Réponse automatique:" msgid "Automated" msgstr "Automatique" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -554,11 +557,11 @@ msgstr "Évitez les renseignements personnels et les plaques d'immatriculation" msgid "Awaiting moderation" msgstr "En attente de modération" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Retour" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Retour vers tous les rapports" @@ -566,10 +569,10 @@ msgstr "Retour vers tous les rapports" msgid "Ban user" msgstr "Bannir un utilisateur" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -578,17 +581,17 @@ msgstr "Interlocuteurs" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Interlocuteur" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Interlocuteur:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "Fichier CSV" @@ -604,7 +607,7 @@ msgstr "Si vous ne trouvez pas notre e-mail? Vérifiez dans votre dossier spam." msgid "Can't see the map? Skip this step" msgstr "Vous ne pouvez pas voir le plan ? Sautez cette étape" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -615,15 +618,15 @@ msgstr "Catégories" msgid "Categories:" msgstr "Catégories:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -636,7 +639,7 @@ msgstr "Catégorie" msgid "Category and State" msgstr "Catégorie et Statistique" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Changement de catégorie de ‘%s’ à ‘%s’" @@ -646,9 +649,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Taux de résolution pour les problèmes > 4 semaines" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -675,11 +678,11 @@ msgstr "Changer le mot de passe" msgid "Change phone number" msgstr "Changer le Téléphone" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "Vérifiez inspection requise si les rapports dans cette catégorie doivent être inspectés avant d'être envoyés." -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -697,7 +700,7 @@ msgstr "" "à afficher le rapport. Au Royaume Uni, nous l'avons utilisé pour des services tels que demander une poubelle supplémentaire \n" "à une adresse donnée." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -706,11 +709,11 @@ msgstr "" "public (ex., \"nid de poule\", \"éclairage public\") mais est aussi utile pour l'interlocuteur.\n" " Elle apparaitra dans le menu déroulant sur la page \"Rapporter-un-problème\"." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "Choisissez un autre" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "Effacer les données hors ligne" @@ -742,9 +745,13 @@ msgstr "Cliquez sur le lien dans ce courrier électronique pour vous conne msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -788,17 +795,17 @@ msgstr "Collaboration :" msgid "Code" msgstr "Code" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "Réduire la carte" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuration" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Confirmer" @@ -819,9 +826,9 @@ msgstr "Confirmez par email à la place, Si vous fournissez un nouveau mot de pa msgid "Confirmation" msgstr "Confirmation" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Confirmé" @@ -851,7 +858,11 @@ msgstr "Contacter l'équipe" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "Convertir l’emplacement Est/Nord" @@ -860,12 +871,12 @@ msgstr "Convertir l’emplacement Est/Nord" msgid "Coordinates:" msgstr "Coordonnées:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Impossible de trouver l'utilisateur" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Le lieu n'a pas pu être trouvé" @@ -873,9 +884,11 @@ msgstr "Le lieu n'a pas pu être trouvé" msgid "Council" msgstr "Administration" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Contacts de l'administration pour %s" @@ -904,8 +917,8 @@ msgstr "Créer un rapport" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Créer une catégorie" @@ -913,15 +926,15 @@ msgstr "Créer une catégorie" msgid "Create priority" msgstr "Créer une priorité" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "Créer un rapports / une mises à jour en tant qu'utilisateur anonyme" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "Créer des rapports/mises à jour de l'administration" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "Créer des rapports/mises à jour pour le compte d'un utilisateur" @@ -935,7 +948,7 @@ msgstr "Créer un modèle" msgid "Created" msgstr "Créé" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "Création %d de nouveaux utilisateurs" @@ -958,12 +971,12 @@ msgstr "Jeton actuel:" msgid "Currently grouped by %s" msgstr "Actuellement regroupé par %s" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Pour l'instant, aucun intelocuteur n'a été créé." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Le client est injoignable" @@ -991,32 +1004,32 @@ msgstr "Défaut" msgid "Default priority" msgstr "Priorité par défaut" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "Type de défaut" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "Effacer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Supprimer le modèle" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Effacé" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "Décrivez pourquoi vous modérez ceci" @@ -1032,18 +1045,18 @@ msgstr "Description" msgid "Description:" msgstr "Description :" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "Les informations détaillées se à %d caractàre." -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Détails :" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1054,7 +1067,7 @@ msgstr "Détails :" msgid "Device and Site" msgstr "Dispositif et site" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Transféré(e)" @@ -1063,24 +1076,24 @@ msgstr "Transféré(e)" msgid "Didn't use map" msgstr "Ne pas utiliser la carte" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Tableau d'honneur de la réactivité" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "Désactiver" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "Désactivé:" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "Annuler les modifications" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Ne pas envoyer d'alertes par email concernant les commentaires sur le problème au créateur" @@ -1089,7 +1102,7 @@ msgstr "Ne pas envoyer d'alertes par email concernant les commentaires sur le pr msgid "Do you have a %s password?" msgstr "Avez-vous un mot de passe %s ?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "Voulez-vous élever automatiquement un défaut?" @@ -1097,7 +1110,7 @@ msgstr "Voulez-vous élever automatiquement un défaut?" msgid "Don’t know" msgstr "Je ne sais pas" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Vous n'aimez pas les formulaires ?" @@ -1105,19 +1118,19 @@ msgstr "Vous n'aimez pas les formulaires ?" msgid "Down one" msgstr "En bas d'un" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Glissez et déposez les photos ici ou cliquer pour les envoyer " -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "Dupliquer de" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "Dupliqués" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1128,8 +1141,8 @@ msgstr "" "Des catégories différents peuvent avoir le même contact (adresse email).\n" "Cela signifie que vous pouvez ajouter plusieurs catégories même si vous n'avez qu'un contact pour l'interlocuteur." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "Abscisse/Ordonnée :" @@ -1137,23 +1150,23 @@ msgstr "Abscisse/Ordonnée :" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Éditer" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Editer les détails de l'intelocuteur" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "Modifier les autorisations des autres utilisateurs" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Éditer la catégorie des rapports" @@ -1161,15 +1174,15 @@ msgstr "Éditer la catégorie des rapports" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Éditer la priorité des rapports" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Éditer les rapports" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "Modifier les détails des utilisateurs/rechercher leurs rapports" @@ -1192,28 +1205,28 @@ msgstr "Édition du problème %d" msgid "Editing update %d" msgstr "Édition de la mise à jour %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Édition de l'utilisateur %d'" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Éditeur" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1242,37 +1255,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "Email verifié:" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Email :" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "Activer" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1280,8 +1293,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1292,8 +1305,8 @@ msgstr "" "Pour plus d' information, lire \n" "cet article. %s" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1303,8 +1316,8 @@ msgstr "" "un destinataire différent (et une méthode d'envoi ) de l'interlocuteur. par exemple, si des rapports pour certaines catégories de\n" "problèmes doivent être envoyées par courriel, alors que d'autres peuvent l'être par Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "Activer cela supprimera le message d’erreur qui est normalement émis lorsqu’une mise à jour n’a pas de description" @@ -1312,7 +1325,7 @@ msgstr "Activer cela supprimera le message d’erreur qui est normalement &e msgid "End Date" msgstr "Date de fin" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "destinataire" @@ -1334,10 +1347,6 @@ msgstr "Saisir un code postal proche, ou une rue et une localité" msgid "Enter a nearby street name and area" msgstr "Saisissez un nom de rue proche, la localité ou le code postal" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "Entrez une rue, une zone ou un point de repère" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Saisissez les détails du problème" @@ -1351,13 +1360,13 @@ msgstr "Saisissez les détails du problème" msgid "Error" msgstr "Erreur" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Tout" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Exemple de code postal %s" @@ -1369,11 +1378,11 @@ msgstr "Exemples :" msgid "Existing category" msgstr "Catégorie existante" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "Les utilisateurs existants ne seront pas modifiés." -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "Agrandir la carte" @@ -1390,7 +1399,7 @@ msgstr "Exporter en tant que CSV" msgid "External ID" msgstr "ID externe" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "URL externe" @@ -1411,25 +1420,25 @@ msgstr "Code de’état externe:" msgid "External team" msgstr "Équipe externe" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "Champs supplémentaires" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Donnée supplémentaire:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Précisions supplémentaires" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "Champs supplémentaires:" @@ -1452,11 +1461,12 @@ msgstr "" msgid "Filter report list" msgstr "Liste de filtres de rapport" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Première fois" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Résoudre ceci en chosissant une zone couverte dans le formulaire Saisie des détails interlocuteur ci-dessous." @@ -1476,9 +1486,9 @@ msgstr "Résolu - Administration" msgid "Fixed - User" msgstr "Résolu - Usager" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Signaler comme supprimé" @@ -1486,8 +1496,8 @@ msgstr "Signaler comme supprimé" msgid "Flag user" msgstr "Signaler l'usager" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Signalé" @@ -1495,7 +1505,7 @@ msgstr "Signalé" msgid "Flagged reports and users" msgstr "Rapports signalés et utilisateurs" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Les utilisateurs signalés sont listés dans la page signalé" @@ -1504,7 +1514,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Les utilisateurs signalés ne sont pas restreints en aucune façon. il s'agit juste d'une liste d'utilisateurs qui ont été marqués pour attention." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Signalé :" @@ -1520,7 +1530,7 @@ msgstr "Pour de meilleurs résultats veuillez joindre un gros plan et un plan la msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "Pour chaque option, La clé est la valeur qui est stockée dans la base de données pour cette option et Nom est la valeur affichée pour l'utilisateur." -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Pour plus d'information, Lire comment FixMyStreet utilise Mapit." @@ -1534,11 +1544,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Vous avez oublié votre mot de passe? " -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Transmis à l'administration" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "Souhait transmis à l'administration" @@ -1554,6 +1564,8 @@ msgstr "Générer un jeton" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Recevoir les mises à jour" @@ -1584,9 +1596,9 @@ msgstr "Heureux d'entendre qu'il a été résolu!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1596,7 +1608,7 @@ msgstr "Ok" msgid "Going to send questionnaire?" msgstr "Envoi du questionnaire ?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "Accorder l'accès à l'admin" @@ -1604,7 +1616,7 @@ msgstr "Accorder l'accès à l'admin" msgid "Graph of problem creation by status over time" msgstr "Graphique historique des problèmes créés, par statut" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "Groupe" @@ -1655,11 +1667,11 @@ msgstr "Caché(s)" msgid "Hidden Field" msgstr "Champ caché" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "Masquer tous les rapports et mises à jour" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "Masquer tout le rapport" @@ -1680,9 +1692,9 @@ msgstr "Cacher mon nom dans cette mise à jour" msgid "Hide my name on this report" msgstr "Cacher mon nom sur ce rapport" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Cacher les épingles" @@ -1699,11 +1711,11 @@ msgstr "Cacher votre nom?" msgid "Hint" msgstr "Allusion" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Historique" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Retour" @@ -1711,7 +1723,7 @@ msgstr "Retour" msgid "How to report a problem" msgstr "Comment signaler un problème" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Comment envoyer des rapports réussis" @@ -1733,7 +1745,7 @@ msgstr "Je suis désolé, nous n'avons pas trouvé votre problème dans notre ba #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1742,8 +1754,8 @@ msgstr "Je suis désolé, nous n'avons pas trouvé votre problème dans notre ba msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1765,13 +1777,13 @@ msgstr "Si coché, l'utilisateur ne verra pas un champ de saisie, juste le msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "Si cette option est cochée, ce modèle sera utilisé pour les mises à jour Open311 qui posent des problèmes dans cet état." -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Si deux interlocuteurs ou plus servent le même lieu, FixMyStreet combine les catégories identiques dans une saisie unique du menu. Vérifiez que vous utilisez le même nom de catégorie pour les interlocuteurs si vous voulez que ce mode de fonctionnement. " -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "Si vous nous contacté pour un rapport ou une mise à jour spécifique, veuillez inclure un lien vers le rapport dans le message." @@ -1783,6 +1795,10 @@ msgstr "Si vous générez un nouveau jeton, le jeton existant ne fon msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Si vous obtenez un peu plus d'informations sur l'état de votre problème, s'il vous plaît revenez sur le site et effectuez une mise à jour." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Si vous voulez que seulement cette priorité soit une option pour des catégories spécifiques, choisissez-les ici. Par défaut, elles seront visibles pour toutes les catégories." @@ -1812,34 +1828,34 @@ msgstr "" "Si vous souhaitez effectuer une mise à jour publique concernant ce problème, s'il vous plaît renseigné le ici\n" "(Veuillez noter qu'elle ne sera pas envoyée à l'administration)." -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Si vous utilisez une méthode d'envoi autre que le courriel, saisissez le service ID (Open311) ou un identifiant équivalent ici." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID invalide" @@ -1847,7 +1863,7 @@ msgstr "ID invalide" msgid "Illegal feed selection" msgstr "Sélection de flux invalide" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "Importer des utilisateurs" @@ -1859,7 +1875,7 @@ msgstr "En table d'abus ?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "En plus, les attributs suivants qui ne font pas partie de la spécification Open311 v2 sont renvoyés : agency_sent_datetime, title (qui est aussi renvoyé dans la description), interface_used, comment_count, requestor_name (seulement s'il est présent et que le requérant nous a autorisé à l'afficher sur le site)" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "Inactif" @@ -1875,15 +1891,15 @@ msgstr "Inclure les détails personnels du reporter" msgid "Incorrect has_photo value \"%s\"" msgstr "Valeur has_photo invalide \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "Inspecter le rapport" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "inspection requise" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "Instruire entrepreneurs pour résoudre les problèmes" @@ -1891,7 +1907,7 @@ msgstr "Instruire entrepreneurs pour résoudre les problèmes" msgid "Internal notes" msgstr "Notes internes" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "Conflit Internet" @@ -1899,12 +1915,12 @@ msgstr "Conflit Internet" msgid "Invalid agency_responsible value %s" msgstr "Valeur agency_responsible invalide \"%s\"" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Format spécifié %s invalide" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "Location invalide. Le nouvel emplacement doit être couvert par la même administration." @@ -1925,7 +1941,7 @@ msgstr "Clé" msgid "Label" msgstr "Label" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "La langue" @@ -1938,8 +1954,8 @@ msgstr "Langues" msgid "Last 7 days" msgstr "Les 7 dernièrs jours" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Dernier auteur" @@ -1955,17 +1971,17 @@ msgstr "Dernière actualisation :" msgid "Last update:" msgstr "Dernière actualisation :" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "Latitude/Longitude:" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "Moins récemment mis à jour" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Laisser ce champ vide si tous les rapports pour cet interlocuteur doivent être envoyés en utilisant la même méthode (cead, \"%s\")." @@ -1973,7 +1989,7 @@ msgstr "Laisser ce champ vide si tous les rapports pour cet interlocuteur doiven msgid "List" msgstr "Liste" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Lister tous les problèmes rapportés" @@ -2017,16 +2033,16 @@ msgstr "Se connecter avec Facebook" msgid "Log in with Twitter" msgstr "Se connecter avec Twitter" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Se connecter par email" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "Connectez-vous avec email/texte" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "Se déconnecter de toutes les sessions" @@ -2034,23 +2050,23 @@ msgstr "Se déconnecter de toutes les sessions" msgid "Look up" msgstr "Chercher" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "CARTE" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "Rendre anonyme tous les rapports et mises à jour" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "Gérer la liste" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "Commande manuelle" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Carte" @@ -2058,15 +2074,15 @@ msgstr "Carte" msgid "Mark as sent" msgstr "Marqué comme envoyé" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Marquer les utilisateurs dont vous voulez surveiller le comportement comme cochés." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "Marquer les détails du problème" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Message" @@ -2082,19 +2098,19 @@ msgstr "Message à l'organisme externe compétent:" msgid "Missing bodies:" msgstr "Organismes disparus :" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "jurisdiction_id manquant" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Modérer" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "Modérer les détails du rapport" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Modérer ce rapport" @@ -2102,10 +2118,10 @@ msgstr "Modérer ce rapport" msgid "Moderate this update" msgstr "Modifiez cette mise à jour" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "Modifiez par %s à %s" @@ -2123,12 +2139,12 @@ msgstr "" msgid "Month" msgstr "Mois" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Les plus commentés" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2140,11 +2156,11 @@ msgstr "Les plus commentés" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2153,7 +2169,7 @@ msgstr "Nom" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Nom :" @@ -2163,11 +2179,11 @@ msgstr "Nom :" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Accédez à ce problème" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "Adresse calculée la plus proche:" @@ -2179,7 +2195,7 @@ msgstr "Route la plus proche de l'épingle placée sur le plan (génerée automa msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Code postal le plus proche de l'épingle placée sur le plan (géneré automatiquement): %s (à %sm d'ici)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Route la plus proche de l'épingle placée sur le plan (génerée automatiquement à partir de Bing Maps): %s" @@ -2205,11 +2221,11 @@ msgstr "Presque fini! Maintenant, veuillez vérifier votre email" msgid "Nearly done! Now check your phone…" msgstr "Presque fini! Maintenant, véeacute;rifiez votre téléphone…" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Nouveau body ajouté" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Nouveau contact de catégorie rajouté" @@ -2245,23 +2261,23 @@ msgstr "Nouveau numéro de téléphone:" msgid "New priority" msgstr "Nouvelle priorité" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "Nouveaux problèmes pour %s" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "Nouveaux problèmes pour %s" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "Nouveaux problèmes pour%s garde dans %s" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "Nouveaux problèmes pour l'identifiant de zone%s" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "Nouveaux problèmes pour le numéro d'identification de quartier %s in body id %s" @@ -2269,7 +2285,7 @@ msgstr "Nouveaux problèmes pour le numéro d'identification de quartier %s in b msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Nouveaux problèmes pour {{COUNCIL}} dans la localité {{WARD}} sur FixMyStreet.fr" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "Nouveaux problèmes près de%s,%s" @@ -2305,11 +2321,11 @@ msgstr "Nouvel état" msgid "New template" msgstr "Nouveau modèle" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "Nouvelles mises à jour sur le rapport %s" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Plus récents" @@ -2321,10 +2337,10 @@ msgstr "Suivant" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2332,11 +2348,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Non" @@ -2344,11 +2359,7 @@ msgstr "Non" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Aucune zone" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Aucun intelocuteur" @@ -2356,7 +2367,7 @@ msgstr "Aucun intelocuteur" msgid "No council selected" msgstr "Aucune administration sélectionnée" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Pas encore de modifications." @@ -2373,11 +2384,11 @@ msgstr "Aucun utilisateur coché trouvé." msgid "No further updates" msgstr "Pas d'autres mises à jour" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "Aucune inspection effectuée par cet inspecteur dans la fourchette de dates sélectionnée." -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "Aucune inspection dans la plage de dates sélectionnée." @@ -2385,12 +2396,12 @@ msgstr "Aucune inspection dans la plage de dates sélectionnée." msgid "No reports to show on map, here are some nearby:" msgstr "Aucun rapport à afficher sur la carte, en voici quelques-uns à proximité:" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Aucun résultat retourné" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2409,8 +2420,8 @@ msgstr "Aucun supporter" msgid "None" msgstr "Aucun" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." @@ -2418,8 +2429,8 @@ msgstr "" "Les utilisateurs (publics) ne doivent pas être associés à toute zone .
\n" "Le personnel autorisés peuvent être associés à la zone dans laquelle ils opèrent." -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2443,13 +2454,13 @@ msgstr "Jamais signalé" msgid "Not reported to council" msgstr "Non signalé à l'administration" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Note" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Note :" @@ -2473,15 +2484,15 @@ msgstr "Nombre de problèmes signalés dans chaque catégorie, msgid "Number of problems reported in each ward, in the last 7 days." msgstr "Nombre de problèmes signalés dans chaque service au cours des 7 derniers jours." -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "Données hors ligne effacées" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "Données de mise à jour hors ligne enregistrées" @@ -2489,16 +2500,16 @@ msgstr "Données de mise à jour hors ligne enregistrées" msgid "Old state" msgstr "Ancien état" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Plus anciens" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "De la part de %s" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2509,7 +2520,7 @@ msgstr "De la part de %s" msgid "Open" msgstr "Ouvert" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "Open311 API Key" @@ -2517,7 +2528,7 @@ msgstr "Open311 API Key" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 pour le serveur FixMyStreet.fr" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "Compétence Open311" @@ -2549,17 +2560,17 @@ msgstr "Ou abonnez-vous par RSS" msgid "Order" msgstr "Commander" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Autres" @@ -2584,8 +2595,8 @@ msgstr "Propriétaire" msgid "Page Not Found" msgstr "Page Introuvable" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Parent" @@ -2599,19 +2610,19 @@ msgstr "Partiel" msgid "Password (optional)" msgstr "Mot de passe (facultatif)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Lien permanent" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Autorisations :" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "Autoriser les mises à jour vierges" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "Téléphone Reporter:" @@ -2631,17 +2642,16 @@ msgstr "Téléphone (facultatif)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "Téléphone vérifié:" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Téléphone" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2652,6 +2662,7 @@ msgstr "Téléphone" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2666,7 +2677,7 @@ msgstr "Photo" msgid "Photo is required." msgstr "La photo est nécessaire." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Photo requise" @@ -2695,11 +2706,15 @@ msgstr "Choisissez votre administration" msgid "Pick your ward" msgstr "Choisissez votre quartier" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Placer l'épingle sur la carte" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Merci d'être poli, concis et précis." @@ -2716,7 +2731,7 @@ msgstr "Merci de vérifier les mots de passe et de réessayer" msgid "Please check your email address is correct" msgstr "Merci de vérifier que votre adresse email est correcte" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2724,11 +2739,11 @@ msgstr "Merci de vérifier que votre adresse email est correcte" msgid "Please check your phone number is correct" msgstr "Veuillez vérifier que votre numéro de téléphone est correct" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Merci de sélectionner une catégorie" @@ -2737,8 +2752,9 @@ msgstr "Merci de sélectionner une catégorie" msgid "Please choose a less commonly-used password" msgstr "Veuillez choisir un mot de passe moins utilisé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Merci de corriger les erreurs ci-dessous" @@ -2757,13 +2773,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Merci de ne pas être injurieux — Calomnier l'administration dévalue le service pour tous les utilisateurs." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Merci d'entrer un message" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2771,90 +2787,90 @@ msgstr "Merci d'entrer un message" msgid "Please enter a mobile number" msgstr "Merci d’entrer un numéro de téléphone portable" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Merci d'entrer un nom" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "S'il vous plaît entrez un nom pour cet organisme" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Merci d'entrer un mot de passe :" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Merci d'enter un sujet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Merci d'entrer un email valide" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Merci d'entrer une adresse email valide" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "Veuillez entrer un email ou un numéro de téléphone valide" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Merci d'entrer quelques détails" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Merci d'entrer votre email" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Saisissez votre prénom" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Merci de saisir votre nom complet, les administrations ont besoin de cette information. Si vous ne souhaitez pas que votre nom soit affiché sur ce site, décochez la case ci-dessous" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Merci de saisir votre nom" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Saisissez votre numéro de téléphone" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Saisissez votre nom de famille" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Saisissez votre profession" @@ -2882,7 +2898,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Merci d'indiquer si vous souhaitez recevoir un autre questionnaire" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "Veuillez vous assurer que votre mot de passe comporte au moins %d caractères" @@ -2908,11 +2924,11 @@ msgstr "Veuillez noter que votre mise à jour n'a pas encore été post msgid "Please note:" msgstr "Quelques remarques :" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "Veuillez fournir un ID en double ou une mise à jour publique pour ce rapport." -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "Veuillez fournir une mise à jour publique de ce rapport." @@ -2948,16 +2964,16 @@ msgstr "Merci de préciser si le problème a été réglé ou non." #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "Veuillez uniquement envoyer une image" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "Merci de vérifier au moins l’un des e-mail/téléphone" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Merci de saisir un message" @@ -2993,12 +3009,12 @@ msgstr "Powered by msgid "Previous" msgstr "Précédent" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "Priorités" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "Priorité" @@ -3012,14 +3028,18 @@ msgstr "Confidentialité" msgid "Privacy and cookies" msgstr "Vie privée et cookies" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privé" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problème" @@ -3042,7 +3062,7 @@ msgstr "Problème %d signalé à l’administration %s" msgid "Problem breakdown by state" msgstr "Répartition des problèmes par état" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problème signalé comme ouvert." @@ -3050,7 +3070,7 @@ msgstr "Problème signalé comme ouvert." msgid "Problem state change based on survey results" msgstr "Changement état des problèmes d'après résultats sondage" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problèmes" @@ -3075,7 +3095,7 @@ msgstr "Problèmes récemment signalés sur FixMyStreet.fr" msgid "Problems within %.1fkm of %s" msgstr "Problèmes entre %.1fkm de %s " -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3100,8 +3120,8 @@ msgstr "Problèmes dans %s, %s" msgid "Property address:" msgstr "Adresse de propriété:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Apporter une mise à jour" @@ -3127,7 +3147,7 @@ msgstr "Détails public" msgid "Public response:" msgstr "Réponse publique:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "Mise à jour publique :" @@ -3152,6 +3172,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Questionnaire %d envoyé pour le problème %s" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Questionnaire rempli par le requérant" @@ -3175,11 +3196,11 @@ msgstr "Flux RSS pour la localité %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "Flux RSS de %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "Flux RSS de %s, dans la localité %s" @@ -3187,7 +3208,7 @@ msgstr "Flux RSS de %s, dans la localité %s" msgid "RSS feed of nearby problems" msgstr "Flux RSS de problèmes à proximité" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3207,6 +3228,14 @@ msgstr "Flux RSS des problèmes locaux récents" msgid "RSS feed of updates to this problem" msgstr "Flux RSS des mises à jour pour ce problème" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3226,11 +3255,11 @@ msgstr "Les problèmes récents, %s" msgid "Recently reported problems" msgstr "Problèmes signalés récemment" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "Récemment mis à jour" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "Rejeter le rapport" @@ -3242,7 +3271,7 @@ msgstr "Rappelez-vous que FixMyStreet est principalement destiné au signalement msgid "Remove" msgstr "Retirer" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "Supprimer les détails du compte" @@ -3256,9 +3285,9 @@ msgstr "Effacer le signalement" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "Supprimer de votre liste" @@ -3284,20 +3313,20 @@ msgstr "Répondre à l'utilisateur:" msgid "Report" msgstr "Rapport" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "Rapport ID :" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Signaler un problème" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "Signaler un problème ici" @@ -3307,7 +3336,7 @@ msgstr "Signaler un problème ici" msgid "Report abuse" msgstr "Signaler un abus" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3341,17 +3370,18 @@ msgid "Report, view, or discuss local problems" msgstr "Signalez et suivez les problèmes locaux" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Signalé anonymement à %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Signalé avant" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Signalé par %s à %s" @@ -3395,28 +3425,28 @@ msgstr "Remis:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Signalisation d'un problème" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Rapports" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Les rapports sont limités à %s caractères de long. Merci de raccourcir votre texte" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3428,7 +3458,7 @@ msgstr "Rapports attendant une validation" msgid "Reports by destination" msgstr "Rapports par destination" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "Les déclarations faites par les utilisateurs de confiance seront envoyés à l'organisme responsable sans être inspecté en premier." @@ -3440,15 +3470,15 @@ msgstr "Selon le type de problème, les rapports à proximité sont msgid "Reports published" msgstr "Rapports publiés" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "Rapports enregistrés hors ligne." -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "Rapports envoyés à %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "Rapports envoyés à %s, entre %s quartier" @@ -3456,11 +3486,11 @@ msgstr "Rapports envoyés à %s, entre %s quartier" msgid "Reports waiting to be sent" msgstr "Rapports en attente d'être envoyés" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "Les rapports seront automatiquement envoyés sans avoir besoin d'être inspecté si la réputation de l'utilisateur est égale ou supérieure à cette valeur. Réglez sur 0 si tous les rapports doivent être inspectés indépendamment." -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "Seuil de réputation" @@ -3500,20 +3530,20 @@ msgstr "Modèles de réponse" msgid "Response Templates for %s" msgstr "Modèles de réponse pour %s" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "Revenir à l'original" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "Revenir au texte original" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "Revenir au titre original" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Lieu correct?" @@ -3525,15 +3555,15 @@ msgstr "L'opérateur pour cette route (déterminé à partir de la référence e msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "L'opérateur pour cette route (selon OpenStreetMAp): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Pivoter à gauche" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3544,23 +3574,23 @@ msgstr "Pivoter à droite" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "La rotation de cette photo annulera les modifications non enregistrées dans le rapport." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satellite" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "Enregistrer + fermer en double" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Enregistrer les modifications" @@ -3569,12 +3599,12 @@ msgstr "Enregistrer les modifications" msgid "Save new fields" msgstr "Sauvegarder de nouveaux champs" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "Sauvegardez avec une mise à jour publique" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "Enregistrement des rapports hors ligne" @@ -3584,7 +3614,8 @@ msgstr "Enregistrement des rapports hors ligne" msgid "Search Reports" msgstr "Rechercher rapports" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Rechercher les utilisateurs" @@ -3593,7 +3624,7 @@ msgid "Search reports" msgstr "Rechercher les rapports" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Rechercher :" @@ -3603,7 +3634,7 @@ msgstr "Rechercher :" msgid "Searching found no reports." msgstr "Aucun rapport trouvé lors de la recherche." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Aucun utilisateur trouvé lors de la recherche." @@ -3619,17 +3650,18 @@ msgstr "Sécurité" msgid "See our privacy policy" msgstr "Voir notre politique de confidentialité" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "Voir les détails des utilisateurs pour les rapports créés en tant que conseil" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Sélectionnez un interlocuteur" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Sélectionnez une zone" @@ -3649,15 +3681,15 @@ msgstr "Sélectionnez plusieurs quartiers?" msgid "Select:" msgstr "Sélectionner :" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "Envoyé" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "Envoyer un statuts Open311 étendus avec des mises à jour de demande de service" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "Envoyer un e-mail de connexion" @@ -3666,7 +3698,7 @@ msgstr "Envoyer un e-mail de connexion" msgid "Sending a confirmation text failed: \"%s\"" msgstr "L’envoi d’un texte de confirmation a échoué: \"%s\"" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "Envoyé le rapport en retour" @@ -3693,7 +3725,7 @@ msgstr "Service:" msgid "Set password" msgstr "Définir un mot de passe" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "Situé à mon emplacement actuel" @@ -3702,9 +3734,9 @@ msgid "Share" msgstr "Partagez" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "Liste" @@ -3712,15 +3744,15 @@ msgstr "Liste" msgid "Shortlist all visible" msgstr "Liste abrégée visible" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Shortlisté" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "Shortlisté par %s" @@ -3732,7 +3764,7 @@ msgstr "Afficher la photo ?" msgid "Show all updates" msgstr "Afficher toutes les mises à jour" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Afficher mon nom publiquement" @@ -3744,21 +3776,21 @@ msgstr "Afficher le nom publiquement ?" msgid "Show older" msgstr "Montrer les plus vieux" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "Afficher les anciens rapports" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "Afficher la photo" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Montrer les épingles" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "Afficher le nom du déclarant" @@ -3801,8 +3833,8 @@ msgstr "Déconnexion" msgid "Some categories may require additional information." msgstr "Certaines catégories peuvent exiger des renseignements supplémentaires." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3819,6 +3851,14 @@ msgstr "Photos de rapports récents" msgid "Some text to localize" msgstr "Du texte pour localiser" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Désolé, ceci semble être un code postal d'une dépendance de la Couronne, que nous ne couvrons pas." @@ -3836,7 +3876,7 @@ msgstr "Désolé, ce n’était pas le bon code" msgid "Sorry, there has been an error confirming your problem." msgstr "Désolé, il n'y a eu une erreur lors de la confirmation de votre problème." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3858,7 +3898,7 @@ msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessay msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Désolé, nous ne pouvions pas enregistrer votre image(s), veuillez essayer à nouveau." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3870,15 +3910,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "Désolé, vous n'êtes pas autorisé à faire cette action." -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Trier par" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "Les utilisateurs du personnel ont la permission de se connecter à l'administration du site." -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "Personnel :" @@ -3886,31 +3926,32 @@ msgstr "Personnel :" msgid "Start Date" msgstr "Date de début" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "État actuel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "L’état et le code d’état externe ne peuvent pas etre utilisés simultanément." #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "L'état a changé pour:" @@ -3923,14 +3964,14 @@ msgstr "L'état a changé pour:" msgid "State:" msgstr "État actuel :" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "État" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3946,7 +3987,7 @@ msgid "Status" msgstr "Statut" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "Toujours ouvert, via questionnaire" @@ -3959,7 +4000,7 @@ msgstr "Street View" msgid "String" msgstr "Chaîne" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "Sous-catégorie" @@ -3967,12 +4008,12 @@ msgstr "Sous-catégorie" msgid "Subdivision/Body" msgstr "Subdivision/Interlocuteur" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Sujet" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Sujet :" @@ -3990,7 +4031,7 @@ msgstr "Envoyer" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -4011,7 +4052,8 @@ msgstr "Soumis" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "S'abonner" @@ -4019,21 +4061,29 @@ msgstr "S'abonner" msgid "Subscribe by email" msgstr "S'abonner par email" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "Abonné:" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "Résumer le problème" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "Résumez vos modifications" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4053,11 +4103,11 @@ msgstr "Rapports résumés" msgid "Summary statistics" msgstr "Statistiques récapitulatives" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "Superuser :" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "Supeusers ont l'autorisation d'effectuer des toutes les actions au sein de l'administration du site." @@ -4075,8 +4125,8 @@ msgstr "" msgid "Template «%s»" msgstr "Modèle «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4086,7 +4136,7 @@ msgstr "Modèles" msgid "Text" msgstr "Texte" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Version texte seulement" @@ -4130,7 +4180,7 @@ msgstr "Merci, heureux d'apprendre que cela a été résolu ! Pourrions-nous ju msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Cette image ne ​​semble pas avoir été chargée correctement (% s), réessayez s'il vous plaît." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Ce lieu ne semble pas être couvert par une administration; peut-être est elle en dehors de la zone couverte. Merci de le saisir à nouveau." @@ -4144,11 +4194,11 @@ msgstr "Ce lieu ne semble pas ce trouver au Royaume-Uni; Merci de le saisir à n msgid "That postcode was not recognised, sorry." msgstr "Ce code postal n'a pas été reconnu, désolé." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Ce problème a été marqué comme envoyé." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Ce problème va maintenant être renvoyé." @@ -4160,23 +4210,23 @@ msgstr "Ce rapport ne peut pas être vu sur %s." msgid "That report has been removed from FixMyStreet." msgstr "Ce rapport a été retiré de FixMyStreet.fr." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "Cet utilisateur a été déconnecté." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "Cet utilisateur a été rendu anonyme sur tous les rapports et mises à jour." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "Les informations personnelles de cet utilisateur ont été supprimées." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "Les rapports et mises à jour de cet utilisateur ont été masqués." -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4184,8 +4234,8 @@ msgstr "" "Cette adresse courriel est le destinataire à qui le rapport sera envoyé pour cette catégorie. \n" "D'autres catégories de cet interlocuteur peuvent avoir la même adresse courriel." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4193,8 +4243,8 @@ msgstr "" "Le destinataire est l'URL du service auquel FixMyStreet se connectera\n" "quand il enverra des rapports à cet interlocuteur." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." @@ -4202,8 +4252,8 @@ msgstr "" "Le groupe est utilisé pour le champ catégorie lorsque\n" " le regroupement des sous-catégories est activé." -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." @@ -4211,10 +4261,10 @@ msgstr "" "La juridiction est seulement nécessaire si le destinataire en gère plus d'une.\n" " Si l'interlocuteur possède son propre destinataire, vous pouvez laisser ce champ vide." -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4226,8 +4276,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "L'attribut Open311 v2 agency_responsible est utilisé pour lister les administrations qui ont reçu le rapport de problème, ce qui n'est pas tout à fait la façon dont l'attribut est défini dans la spécification Open311 v2." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4244,12 +4294,12 @@ msgstr "Le code utilisé pour stocker cette valeur de champ dans la base d msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "L'administration ne pourra intervenir que si vous laissez autant de détails que possible. Décrivez la localisation exacte du problème, ce que c'est, depuis combien de temps il est présent, une description (et une photo du problème si vous en possédez une), etc. " -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Le classement du prix d'assiduité montre l'activité des utilisateurs (qui écrit le plus de rapports)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "L'erreur était : %s" @@ -4295,7 +4345,7 @@ msgstr "Les derniers problèmes à l'intérieur de {{NAME}} rapportés par les u msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Le lien à expiré, ou peut-être vous ne l’avez pas copier coller correctement." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "La liste des zones disponibles est donnée par le service Mapit de %s. " @@ -4316,20 +4366,20 @@ msgstr "L'URL demandée « %s » n'a pas été trouvée sur ce serveur" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "Le type de champ de saisie à afficher à l'utilisateur.Text est un champ de texte simple, Liste est une sélection déroulante." -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "Le fichier CSV téléchargé doit contenir une ligne d'en-tête et les enregistrements doivent avoir les champs suivants (dans cet ordre):" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "L'utilisateur n'a pas pu localiser le problème sur une carte, mais pour voir la zone autour de l'endroit qu'il ou elle a entré" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "L’utilisateur a reçu un email de connexion" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4343,7 +4393,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Il n'y a pas de rapports à montrer." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "Il existe déjà un modèle de réponse automatique pour cette catégorie/Emplacement." @@ -4351,8 +4405,8 @@ msgstr "Il existe déjà un modèle de réponse automati msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Il y a eu un problème pour montrer la page tous les rapports. Réessayez s'il vous plaît ultérieurement." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ultérieurement." @@ -4374,7 +4428,7 @@ msgstr "Il y a un problème avec vos informations de connexion. Si vous ne msgid "There was a problem with your update. Please try again." msgstr "Il y a un problème avec votre mise à jour. Réessayez s'il vous plaît." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Il y a un problème avec votre rapport. Voir s'il vous plaît plus bas." @@ -4391,8 +4445,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4404,7 +4458,7 @@ msgstr "" "Pour plus d' information, lire \n" "cet article. %s" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "Ces utilisateurs n’ont pas été mis à jour." @@ -4422,7 +4476,7 @@ msgstr "Ceux-ci seront envoyés à %s et également publié en msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Cette implémentation de l'API est en cours de travaux et n'est pas encore stabilisée. Elle est susceptible de changer sans avertissement préalable à l'avenir." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4432,12 +4486,12 @@ msgstr "" "Par conséquent, aucune de ses catégories n'apparaitra dans le menu déroulant \"Catégories\" lorsque les utilisateurs rapportent des problèmes.\n" "Pour l'instant, les utilisateurs ne peuvent rapporter de problèmes à cet interlocuteur." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Cet interlocuteur n'a aucun contact. Donc, les problèmes rapportés actuellement à cet interlocuteur ne seront pas envoyés." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4445,18 +4499,17 @@ msgstr "" "Cet intelocuteur recevra seulement des rapports pour des problèmes qui sont situés sur sa zone couverte.\n" "Un interlocuteur ne recevra aucun rapport tant qu'il ne couvre aucune zone." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Cet email a été envoyé aux deux administrations couvrant l'emplacement du problème parce que l'utilisateur ne l'a pas classé ; ignorez-le s'il vous plaît si vous n'êtes pas l'administration responsable pour la question, ou faites-nous savoir la bonne catégorie de problèmes afin que nous puissions l'ajouter à notre système." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Cet email a été envoyé à plus d'une administration couvrant l'emplacement du problème, la catégorie de problème choisie par l'utilisateur étant présente pour chacune d'entre elles ; ignorez-le s'il vous plaît si vous n'êtes pas l'administration responsable pour la question." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ces renseignements sont nécessaires" @@ -4473,7 +4526,11 @@ msgstr "Ceci est un site en développement, le service peut être interrompu à msgid "This is the public text that will be shown on the site." msgstr "Ceci est le texte public qui sera affiché sur le site." -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "Cette page est un moyen rapide de créer de nombreux nouveaux utilisateurs en une seule fois." @@ -4489,12 +4546,16 @@ msgstr "Ce problème n'a pas été résolu" msgid "This problem is still ongoing" msgstr "Ce problème est toujours en cours" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "Ce rapport est un dupliqua. Veuillez mettre è jour le rapport original:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Ce rapport attend une modération." @@ -4515,7 +4576,7 @@ msgstr "Ce rapport est actuellement marqué comme ouvert." msgid "This report is now closed to updates." msgstr "Ce rapport est maintenant fermé aux mises à jour." -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Cette page Web contient également une photo du problème, fournie par l'utilisateur." @@ -4526,7 +4587,7 @@ msgstr "Cette page Web contient également une photo du problème, fournie par l msgid "Time spent (in minutes):" msgstr "Le temps passé (en minutes):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Chronologie" @@ -4564,7 +4625,7 @@ msgstr "Pour limiter cette collection de champs à un seul cobrand, sélec msgid "To limit this collection of fields to a single language, select it here." msgstr "Pour limiter cette collection de champs à une seule langue, sélectionnez-la ici." -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Pour voir une carte de l'emplacement précis de ce problème" @@ -4593,34 +4654,34 @@ msgstr "Les 5 meilleurs quartiers" msgid "Total" msgstr "Total" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "La gestion du trafic est nécessaire ?" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "Traduction" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "Traductions" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "Accrédité par les organismes:" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "Accrédité pour faire des rapports sans être inspectés" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "Accrédité :" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Essayez à nouveau" @@ -4639,16 +4700,16 @@ msgstr "L’authentification à deux facteurs a été d&ea #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "Type" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "Débannir" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4666,7 +4727,7 @@ msgstr "Type d'alerte inconnu" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "erreur inconnue" @@ -4679,7 +4740,7 @@ msgstr "erreur inconnue" msgid "Unknown problem ID" msgstr "ID de problème inconnu" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "ID de mise à jour inconnu" @@ -4692,7 +4753,7 @@ msgid "Up one" msgstr "Remonter d'un" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Mise à jour" @@ -4701,16 +4762,16 @@ msgstr "Mise à jour" msgid "Update %s created for problem %d; by %s" msgstr "Mise à jour %s créée pour le problème %d; par %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Mise à jour ci-dessous ajoutée anonymement à %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Mise à jour ci-dessous ajoutée par %s à %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Interlocuteur pour la mise à jour " @@ -4735,7 +4796,7 @@ msgstr "Une mise à jour a marqué ce problème comme résolu" msgid "Update reopened problem" msgstr "Mettre a jour le problème réouvert" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Mettre à jour les statuts" @@ -4753,14 +4814,14 @@ msgstr "Mis à par %s (%s) à %s" msgid "Updated by %s at %s" msgstr "Mis à par %s à %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Mis à jour !" @@ -4785,12 +4846,12 @@ msgstr "Mises à jour sur {{title}}" msgid "Updates to this problem, %s" msgstr "Mises à jour de ce problème, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "Notes d’utilisation" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4806,15 +4867,15 @@ msgstr "" "conserve dans les filtres de la carte, et deleted supprime la \n" "catégorie." -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "Utiliser la récupération de problèmes Open311" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "Utiliser l'extension de mise à jour d'envoi Open311" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "Utilisez ce champ pour enregistrer les détails qui sont affichés uniquement dans le portail d'admin du site. L'entrée n'est pas affichée publiquement, et n'est pas envoyée à l'administration." @@ -4823,48 +4884,48 @@ msgstr "Utilisez ce champ pour enregistrer les détails qui sont affichés uniqu msgid "Used map" msgstr "Carte utilisée" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "ID utilisateur de récupération des commentaires à" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "Import utilisateur" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "Utilisateur ajouté à la liste d’abus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "L’utilisateur existe déjà" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "Utilisateur déjà dans la liste d’abus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Utilisateur dé–signalé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Utilisateur signalé" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "Utilisateur dans le tableau d’abus" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "La recherche utilisateurs parcourt les noms et adresses courriel." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "Alertes de l'utilisateur" @@ -4873,20 +4934,20 @@ msgstr "Alertes de l'utilisateur" msgid "User:" msgstr "Utilisateur:" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Utilisateurs" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "Les utilisateurs peuvent effectuer les actions suivantes concernant leur administration ou dans la zone affectée." -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Valeurs mises à jour" @@ -4920,12 +4981,12 @@ msgstr "Afficher les rapports par quartier" msgid "View wards" msgstr "Voir les quartiers" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Consultation d'un lieu" @@ -4960,7 +5021,7 @@ msgstr "Nous avons envoyé un code de confirmation à votre té msgid "We need your email address, please give it below." msgstr "Nous avons besoin de votre adresse e-mail, veuillez l'indiquer ci-dessous." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Nous sommes conscients que ce problème pourrait être la responsabilité de %s, mais nous n'avons actuellement pas leurs coordonnées. Si vous connaissez une adresse de contact approprié, faites-le nous savoir s'il vous plaît." @@ -4975,8 +5036,8 @@ msgstr "Nous trouvons jusqu’à dix résultats, veuillez essaye #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Nous utiliserons vos informations personnelles en accord avec notre politique de confidentialité." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4990,8 +5051,12 @@ msgstr "Website" msgid "We’ll get back to you as soon as we can." msgstr "Nous reviendrons vers vous dès que nous le pouvons." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Édité le" @@ -5011,14 +5076,10 @@ msgstr "l'utilisateur doit fournir une valeur pour ce domaine." msgid "Which problems do you want alerts about?" msgstr "De quels problèmes voulez-vous alerter?" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "De quel rapport ? s'agit-il d'un double exemplaire?" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "Trois photos suffisent." - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "Pourquoi arrêter là ? déclarer plus d’alertes gratuitement." @@ -5039,15 +5100,19 @@ msgstr "Aimeriez-vous contribuer à FixMyStreet? Notre code est open source et < msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Aimeriez-vous recevoir un autre questionnaire dans 4 semaines, pour vous rappeler de vérifier l'état?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Si vous rédigez votre message entièrement en capitales, ou sans ponctuation, il sera difficile à lire." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5056,20 +5121,19 @@ msgstr "Si vous rédigez votre message entièrement en capitales, ou sans ponctu #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Oui" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Vous ne comprenez pas les raisons pour lesquelles ce rapport a été inutilement retiré:" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "vous êtes hors ligne" @@ -5077,7 +5141,7 @@ msgstr "vous êtes hors ligne" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Vous signalez le rapport de problème suivant comme étant violent, contenant des renseignements personnels, ou similaires :" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Vous signalez la mise à jour suivante comme étant violente, contenant des renseignements personnels, ou similaires :" @@ -5090,7 +5154,7 @@ msgstr "Vous pouvez créer un nouveau rapport au mêm msgid "You can view the problem on this site." msgstr "Vous pouvez consulter le problème sur ce site." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Vous pouvez ajouter un courriel d'utilisateur abusif dans la liste des abus, qui cache automatiquement (et n'envoie jamais) les rapports qu'ils crèent." @@ -5098,7 +5162,7 @@ msgstr "Vous pouvez ajouter un courriel d'utilisateur abusif dans la liste des a msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "Vous pouvez choisir de vous abonner à tous les problèmes signalés dans une zone ou des rapports suivant leur destination." -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Vous pouvez contacte le support technique par le courriel %s" @@ -5119,15 +5183,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Vous pouvez nous aider en trouvant une adresse e-mail de contact pour les problèmes locaux pour %s et en nous l'envoyant à %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Vous pouvez marqué un interlocuteur comme supprimé si vous ne voulez pas qu'il soit actif sur le site." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Vous avez refusé; merci de remplir le champ ci-dessus" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "vous avez %s sauvegradé à publié." @@ -5193,7 +5257,7 @@ msgstr "Vous n'avez pas encore short-listé de rapport." msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Vous devez ajouter des interlocuteurs (comme des municipalités ou des services publics) pour que des rapports puissent être envoyés." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5215,9 +5279,10 @@ msgstr "Votre compte" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Votre email" @@ -5233,10 +5298,10 @@ msgid "Your email or mobile" msgstr "Votre email ou mobile" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Votre information sera utilisée seulement en accord avec notre politique de confidentialité" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Votre nom" @@ -5252,7 +5317,7 @@ msgstr "Votre nom a été caché de tous vos rapports et mises msgid "Your name has been hidden." msgstr "Votre nom a été caché." -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "Vos rapports hors ligne" @@ -5275,7 +5340,7 @@ msgid "Your password should include %d or more characters." msgstr "Votre mot de passe doit inclure %d ou plus de caractères." #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Votre numéro de téléphone" @@ -5300,7 +5365,7 @@ msgstr "Votre jeton a été généré" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "Votre mise à jour a été sauvegardée en mode hors connexion pour la soumission en ligne." @@ -5317,25 +5382,24 @@ msgstr "Votre code de vérification est %s" msgid "Yourself" msgstr "Vous" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "admin" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "Tous" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "un administrateur" @@ -5369,8 +5433,8 @@ msgstr "par exemple. 'Nid de poule de 10cm sur la route St, près de la bo msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "par exemple. 'Ce nid de poule existe depuis deux mois et…'" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "saisissez l'utilisateur" @@ -5379,12 +5443,12 @@ msgstr "saisissez l'utilisateur" msgid "from %s different users" msgstr "de %s utilisateurs différents" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "dernière mise à jour %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "moins d'une minute" @@ -5395,7 +5459,7 @@ msgid "n/a" msgstr "s.o." #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "aucun" @@ -5435,7 +5499,7 @@ msgstr "saisi initialement: “%s”" msgid "other areas:" msgstr "autres lieux:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "montrer" @@ -5443,7 +5507,7 @@ msgstr "montrer" msgid "sign out" msgstr "déconnexion" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "l'ID de base de données de l’administration auquel est associer cet utilisateur, par ex.2217 pour Versailles." @@ -5460,19 +5524,19 @@ msgstr "Il n'y a aucune épingle affichée parce que l'utilisateur n'a pas utili msgid "this location" msgstr "ce lieu" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "Ce type de problème local" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "aujourd'hui" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "mettre à jour" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "mises à jour" @@ -5488,11 +5552,11 @@ msgstr "l'utilisateur est de la même administration que le problème - %d" msgid "user is problem owner" msgstr "L'utilisateur est propriétaire du problème" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "utilisateur ne figurant pas dans la liste d’abus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "utilisateur supprimé de la liste d’abus" @@ -5501,35 +5565,35 @@ msgstr "utilisateur supprimé de la liste d’abus" msgid "ward" msgstr "localité" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "%d adresses" msgstr[1] "%d adresses" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5543,14 +5607,14 @@ msgid_plural "%d supporters" msgstr[0] "%d supporter" msgstr[1] "%d supporters" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semaine" msgstr[1] "%d semaines" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5620,7 +5684,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s mise à jour de rapport" msgstr[1] "%s mises à jour de rapports" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5641,7 +5705,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Nous n'avons pas encore de détails pour l'administration responsable de ce lieu." msgstr[1] "Nous n'avons pas encore de détails pour les administrations responsables de ce lieu." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po index b058c4cd9d2..d8c390713a6 100644 --- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Hebrew (Israel) (https://www.transifex.com/mysociety/teams/12067/he_IL/)\n" "Language: he_IL\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "וגם" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "וגם" msgid " or " msgstr "או" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "%d תווים לכל היותר" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d עריכות מאת %s" @@ -48,7 +48,7 @@ msgstr "%d עריכות מאת %s" msgid "%d to %d of %d" msgstr "" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "" msgid "(no longer exists)" msgstr "(לא קיים עוד)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "" @@ -163,11 +163,11 @@ msgstr "" msgid "(optional)" msgstr "(רשות)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "(נשלח לכולם)" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(נשלח לשניהם)" @@ -176,13 +176,13 @@ msgstr "(נשלח לשניהם)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- נא לבחור קטגוריה --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "-- נא לבחור באפשרות --" @@ -190,8 +190,8 @@ msgstr "-- נא לבחור באפשרות --" msgid "--Choose a template--" msgstr "--נא לבחור תבנית--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -232,11 +232,11 @@ msgstr "" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "" msgid "Add" msgstr "הוספה" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "" @@ -291,8 +291,8 @@ msgstr "הוספת שדה" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "הוספת קטגוריה חדשה" @@ -307,27 +307,27 @@ msgstr "הוספת מספר טלפון" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "הוספה לרשימה מקוצרת" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "הוספת משתמש" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "הוספה/עריכה של קטגוריות תקלות" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "הוספה/עריכה של עדיפויות מענה" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "הוספה/עריכה של תבניות תגובה" @@ -335,7 +335,7 @@ msgstr "הוספה/עריכה של תבניות תגובה" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "להודיע לי על עדכונים עתידיים" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "כל הדיווחים בין %s לבין %s" msgid "All time" msgstr "מתישהו" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "משתמש אלמוני" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "אלמוני:" @@ -445,29 +448,29 @@ msgstr "אלמוני:" msgid "Another user" msgstr "משתמש אחר" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "לבטל את ההעלאה הזאת?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "להמשיך?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "שטח כיסוי" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "שטח:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -488,11 +491,11 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "" @@ -504,8 +507,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "מענה אוטומטי:" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "חזרה" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "חזרה לכל הדיווחים" @@ -554,10 +557,10 @@ msgstr "חזרה לכל הדיווחים" msgid "Ban user" msgstr "חסימת משתמש" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "קובץ CSV" @@ -592,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "אין לך אפשרות לצפות במפה? ניתן לדלג על שלב זה" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "קטגוריות" msgid "Categories:" msgstr "קטגוריות:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "קטגוריה" msgid "Category and State" msgstr "קטגוריה ומדינה" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "החלפת ססמה" msgid "Change phone number" msgstr "החלפת מספר טלפון" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -678,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -720,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,17 +773,17 @@ msgstr "" msgid "Code" msgstr "קוד" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "תצורה" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "אישור" @@ -797,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "אישור" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "אושר" @@ -829,7 +836,11 @@ msgstr "יצירת קשר עם הצוות" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -838,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "נקודות ציון:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "לא ניתן למצוא את המשתמש" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "לא ניתן לחפש את המיקום" @@ -851,9 +862,11 @@ msgstr "לא ניתן לחפש את המיקום" msgid "Council" msgstr "עירייה" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "" @@ -882,8 +895,8 @@ msgstr "יצירת דוח" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "יצירת קטגוריה" @@ -891,15 +904,15 @@ msgstr "יצירת קטגוריה" msgid "Create priority" msgstr "יצירת עדיפות" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +926,7 @@ msgstr "יצירת תבנית" msgid "Created" msgstr "" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -936,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -969,32 +982,32 @@ msgstr "בררת מחדל" msgid "Default priority" msgstr "עדיפות בררת מחד" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "סוג המפגע" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "מחיקת תבנית" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "נמחק" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1010,18 +1023,18 @@ msgstr "תיאור" msgid "Description:" msgstr "תיאור:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "פרטים" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1032,7 +1045,7 @@ msgstr "פרטים:" msgid "Device and Site" msgstr "התקן ואתר" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -1041,24 +1054,24 @@ msgstr "" msgid "Didn't use map" msgstr "לא נעשה שימוש במפה" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "התעלמות משינויים" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1067,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "לא ידוע לי" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "לא בא לך על טפסים?" @@ -1083,19 +1096,19 @@ msgstr "לא בא לך על טפסים?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "כפיל של" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1103,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1112,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "עריכה" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "ערוך פרטי גוף" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1136,15 +1149,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "עריכת דוחות" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1167,28 +1180,28 @@ msgstr "ערוך בעיה %d" msgid "Editing update %d" msgstr "ערוך עידכון %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "ערוך משתמש %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "עורך" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "דוא״ל" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1217,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "כתובת דוא״ל אומתה:" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "דוא\"ל:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1255,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1264,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1281,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "מועד סיום" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "נקודת סיום" @@ -1303,10 +1316,6 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "נא להקליד את פרטי התקלה" @@ -1320,13 +1329,13 @@ msgstr "נא להקליד את פרטי התקלה" msgid "Error" msgstr "שגיאה" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "הכול" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "" @@ -1338,11 +1347,11 @@ msgstr "דוגמאות:" msgid "Existing category" msgstr "קטגוריה קיימת" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "הרחבת המפה" @@ -1359,7 +1368,7 @@ msgstr "יצוא כ־CSV" msgid "External ID" msgstr "מזהה חיצוני" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "כתובת חיצונית" @@ -1380,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "צוות חיצוני" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "שדות נוספים" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "נתונים נוספים:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "פרטים נוספים" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1421,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "שם פרטי" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1445,9 +1455,9 @@ msgstr "" msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "" @@ -1455,8 +1465,8 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "" @@ -1464,7 +1474,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1473,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "" @@ -1489,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1503,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1523,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "קבלת עדכונים" @@ -1553,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1565,7 +1577,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1624,11 +1636,11 @@ msgstr "" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "הסתרת הדוח כולו" @@ -1649,9 +1661,9 @@ msgstr "הסתרת השם שלי בעדכון זה" msgid "Hide my name on this report" msgstr "הסתרת השם שלי בדוח זה" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "הסתרת נעצים" @@ -1668,11 +1680,11 @@ msgstr "להסתיר את השם שלך?" msgid "Hint" msgstr "רמז" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "היסטוריה" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "בית" @@ -1680,7 +1692,7 @@ msgstr "בית" msgid "How to report a problem" msgstr "כיצד לדווח על תקלה" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "איך לשלוח דיווחים מוצלחים" @@ -1702,7 +1714,7 @@ msgstr "" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1711,8 +1723,8 @@ msgstr "" msgid "ID" msgstr "מזהה" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1734,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1752,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1779,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "מזהה שגוי" @@ -1814,7 +1830,7 @@ msgstr "מזהה שגוי" msgid "Illegal feed selection" msgstr "בחירת שדות שגויה" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1826,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "בלתי פעיל" @@ -1842,15 +1858,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "חקירת דוח" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "נדרשת חקירה" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "הנחיית קבלני ביצוע לתיקון תקלות" @@ -1858,7 +1874,7 @@ msgstr "הנחיית קבלני ביצוע לתיקון תקלות" msgid "Internal notes" msgstr "הערות פנימיות" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "נפילה באינטרנט" @@ -1866,12 +1882,12 @@ msgstr "נפילה באינטרנט" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1892,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "שפה" @@ -1905,8 +1921,8 @@ msgstr "שפות" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "" @@ -1922,17 +1938,17 @@ msgstr "עדכון אחרון:" msgid "Last update:" msgstr "" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1940,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "" @@ -1984,16 +2000,16 @@ msgstr "כניסה עם פייסבוק" msgid "Log in with Twitter" msgstr "כניסה עם טוויטר" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "כניסה עם דוא״ל" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2001,23 +2017,23 @@ msgstr "" msgid "Look up" msgstr "חיפוש" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "סדר ידני" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2025,15 +2041,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "הודעה" @@ -2049,19 +2065,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2069,10 +2085,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2090,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "חודש" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2107,11 +2123,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2120,7 +2136,7 @@ msgstr "שם" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "שם:" @@ -2130,11 +2146,11 @@ msgstr "שם:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "ניווט לבעיה הזאת" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2146,7 +2162,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2170,11 +2186,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "" @@ -2210,23 +2226,23 @@ msgstr "מספר טלפון חדש:" msgid "New priority" msgstr "עדיפות חדשה" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2234,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2270,11 +2286,11 @@ msgstr "מצב חדש" msgid "New template" msgstr "תבנית חדשה" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2286,10 +2302,10 @@ msgstr "" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2297,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "" @@ -2309,11 +2324,7 @@ msgstr "" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "" @@ -2321,7 +2332,7 @@ msgstr "" msgid "No council selected" msgstr "" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "" @@ -2338,11 +2349,11 @@ msgstr "" msgid "No further updates" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2350,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2372,15 +2383,15 @@ msgstr "אין תומכים" msgid "None" msgstr "" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2400,13 +2411,13 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "" @@ -2430,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "אישור" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2446,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "מצב ישן" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "בשם %s" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2466,7 +2477,7 @@ msgstr "בשם %s" msgid "Open" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2474,7 +2485,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "תחום השיפוט של Open311" @@ -2506,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "אחר" @@ -2541,8 +2552,8 @@ msgstr "" msgid "Page Not Found" msgstr "העמוד לא נמצא" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "" @@ -2556,19 +2567,19 @@ msgstr "" msgid "Password (optional)" msgstr "ססמה (רשות)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "קישור קבוע" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "הרשאות:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2588,17 +2599,16 @@ msgstr "מספר טלפון (רשות)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "טלפון:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2609,6 +2619,7 @@ msgstr "טלפון:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2623,7 +2634,7 @@ msgstr "תמונה" msgid "Photo is required." msgstr "נדרשת תמונה." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "נדרשת תמונה" @@ -2652,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "הצבת נעץ על מפה" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" @@ -2673,7 +2688,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,11 +2696,11 @@ msgstr "" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "נא לבחור קטגוריה" @@ -2694,8 +2709,9 @@ msgstr "נא לבחור קטגוריה" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2711,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "נא לכתוב הודעה" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,90 +2741,90 @@ msgstr "נא לכתוב הודעה" msgid "Please enter a mobile number" msgstr "נא להקליד מספר טלפון" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "נא להזין שם" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "נא להקליד ססמה" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "נא להקליד נושא" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "נא להקליד כתובת דוא״ל תקנית" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "נא להקליד כתובת דוא״ל תקנית" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "נא להקליד כתובת דוא״ל או טלפון תקניים" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "" @@ -2836,7 +2852,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2862,11 +2878,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2902,16 +2918,16 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "" @@ -2947,12 +2963,12 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2966,14 +2982,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2996,7 +3016,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "" @@ -3004,7 +3024,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -3029,7 +3049,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3054,8 +3074,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" @@ -3081,7 +3101,7 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3106,6 +3126,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -3129,11 +3150,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -3141,7 +3162,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3161,6 +3182,14 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3180,11 +3209,11 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3196,7 +3225,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3210,9 +3239,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3238,20 +3267,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3261,7 +3290,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3295,17 +3324,18 @@ msgid "Report, view, or discuss local problems" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -3349,28 +3379,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3382,7 +3412,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3394,15 +3424,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3410,11 +3440,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3454,20 +3484,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3479,15 +3509,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3498,23 +3528,23 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -3523,12 +3553,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3538,7 +3568,8 @@ msgstr "" msgid "Search Reports" msgstr "" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "" @@ -3547,7 +3578,7 @@ msgid "Search reports" msgstr "" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" @@ -3557,7 +3588,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3573,17 +3604,18 @@ msgstr "אבטחה" msgid "See our privacy policy" msgstr "הצגת מדיניות הפרטיות שלנו" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "בחירת אזור" @@ -3603,15 +3635,15 @@ msgstr "לבחור מספר מחלקות?" msgid "Select:" msgstr "בחירה:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "שליחה" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3620,7 +3652,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3647,7 +3679,7 @@ msgstr "שירות:" msgid "Set password" msgstr "הגדרת ססמה" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "הגדרה למיקום הנוכחי שלי" @@ -3656,9 +3688,9 @@ msgid "Share" msgstr "שיתוף" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3666,15 +3698,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3686,7 +3718,7 @@ msgstr "להציג תמונה?" msgid "Show all updates" msgstr "הצגת כל העדכונים" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "הצגת השם שלי לקהל הרחב" @@ -3698,21 +3730,21 @@ msgstr "להציג את השם לקהל הרחב?" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "הצגת תמונה" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "הצגת נעצים" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "הצגת שם המדווח" @@ -3755,8 +3787,8 @@ msgstr "יציאה" msgid "Some categories may require additional information." msgstr "לחלק מהקטגוריות נדרש מידע נוסף." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3771,6 +3803,14 @@ msgstr "כל מיני תמונות של דיווחים אחרונים" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3788,7 +3828,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3810,7 +3850,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3820,15 +3860,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3836,31 +3876,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3873,14 +3914,14 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3896,7 +3937,7 @@ msgid "Status" msgstr "" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3909,7 +3950,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3917,12 +3958,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" @@ -3940,7 +3981,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3961,7 +4002,8 @@ msgstr "" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -3969,21 +4011,29 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4003,11 +4053,11 @@ msgstr "" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4025,8 +4075,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4036,7 +4086,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "" @@ -4080,7 +4130,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4094,11 +4144,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "" @@ -4110,53 +4160,53 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4166,8 +4216,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4182,12 +4232,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "" @@ -4233,7 +4283,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4254,20 +4304,20 @@ msgstr "" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4279,7 +4329,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4287,8 +4341,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4310,7 +4364,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -4327,8 +4381,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4337,7 +4391,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4355,36 +4409,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4401,7 +4454,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4417,12 +4474,16 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4443,7 +4504,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4454,7 +4515,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4492,7 +4553,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4521,34 +4582,34 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "" @@ -4567,16 +4628,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "סוג" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4594,7 +4655,7 @@ msgstr "סוג ההתרעה אינו מוכר" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "שגיאה לא ידועה" @@ -4607,7 +4668,7 @@ msgstr "שגיאה לא ידועה" msgid "Unknown problem ID" msgstr "מזהה התקלה לא ידוע" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "מזהה העדכון לא ידוע" @@ -4620,7 +4681,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "עדכון" @@ -4629,16 +4690,16 @@ msgstr "עדכון" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4663,7 +4724,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4681,14 +4742,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "" @@ -4713,12 +4774,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4728,15 +4789,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4745,48 +4806,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4795,20 +4856,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4842,12 +4903,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4882,7 +4943,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4897,7 +4958,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4912,8 +4973,12 @@ msgstr "אתר" msgid "We’ll get back to you as soon as we can." msgstr "נשוב אליך בהקדם האפשרי." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "מתי נערך" @@ -4933,14 +4998,10 @@ msgstr "האם על המשתמש לספק ערך לשדה הזה." msgid "Which problems do you want alerts about?" msgstr "באילו תקלות מעניין אותך להתעדכן?" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "הדיווח הזה הוא כפיל של איזה דיווח?" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "למה לעצור כאן? ניתן להגדיר עוד התראות בחינם." @@ -4961,15 +5022,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4978,20 +5043,19 @@ msgstr "" #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "כן" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -4999,7 +5063,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5012,7 +5076,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5020,7 +5084,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5038,15 +5102,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5112,7 +5176,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5134,9 +5198,10 @@ msgstr "החשבון שלך" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "כתובת הדוא״ל שלך" @@ -5152,10 +5217,10 @@ msgid "Your email or mobile" msgstr "כתובת הדוא״ל או מספר הנייד שלך" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "השם שלך" @@ -5171,7 +5236,7 @@ msgstr "השם שלך מוסתר בכל הדיווחים והעדכונים של msgid "Your name has been hidden." msgstr "השם שלך הוסתר." -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "הדיווחים הבלתי מקוונים שלך" @@ -5194,7 +5259,7 @@ msgid "Your password should include %d or more characters." msgstr "על הססמה שלך להכיל %d תווים או יותר." #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "מס׳ הטלפון שלך" @@ -5219,7 +5284,7 @@ msgstr "האסימון שלך נוצר" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "העדכון שלך נשמר באופן בלתי מקוון להגשה בעת חידוש החיבור לאינטרנט." @@ -5236,25 +5301,24 @@ msgstr "קוד האימות שלך הוא %s" msgid "Yourself" msgstr "עצמך" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "הכול" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5288,8 +5352,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "עריכת משתמש" @@ -5298,12 +5362,12 @@ msgstr "עריכת משתמש" msgid "from %s different users" msgstr "מ־%s משתמשים שונים" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "עדכון אחרון: %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "פחות מדקה" @@ -5314,7 +5378,7 @@ msgid "n/a" msgstr "" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5354,7 +5418,7 @@ msgstr "" msgid "other areas:" msgstr "אזורים אחרים:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "הצגה" @@ -5362,7 +5426,7 @@ msgstr "הצגה" msgid "sign out" msgstr "יציאה" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5379,19 +5443,19 @@ msgstr "" msgid "this location" msgstr "המיקום הזה" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "סוג זה של בעיה מקומית" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "היום" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "עדכון" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "עדכונים" @@ -5407,11 +5471,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5420,7 +5484,7 @@ msgstr "" msgid "ward" msgstr "מחלקה" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5429,7 +5493,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5438,7 +5502,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5447,7 +5511,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5456,7 +5520,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5474,7 +5538,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5483,7 +5547,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5573,7 +5637,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5600,7 +5664,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po index 89c78d6deb6..f6b68e7e076 100644 --- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Croatian (https://www.transifex.com/mysociety/teams/12067/hr/)\n" "Language: hr\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "i" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "i" msgid " or " msgstr "ili" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "Najviše %dznakova" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d izmjene od strane %s" @@ -48,7 +48,7 @@ msgstr "%d izmjene od strane %s" msgid "%d to %d of %d" msgstr "%d do %d od %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(grafiti, ilegalno odlaganje otpada, oštećeni kolnici, klupe, lampe... msgid "(no longer exists)" msgstr "(više ne postoji)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(nije poslano odgovornom tijelu)" @@ -163,11 +163,11 @@ msgstr "(nije poslano odgovornom tijelu)" msgid "(optional)" msgstr "(nije obavezno)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(poslano na obje adrese)" @@ -176,13 +176,13 @@ msgstr "(poslano na obje adrese)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(također omogućavamo pretplate na RSS izvore za probleme unutar %s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Izaberite kategoriju --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "-- Odaberite predložak --" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -206,11 +206,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "

Broj prijava, akcija i općih statistika za

%s

" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr " %s prijave %s" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%s spremljeno." @@ -235,11 +235,11 @@ msgstr "No Potvrdi moje ažuriranje e-mailom" msgid "No Let me confirm my update by email/text" msgstr "Ne - Želim ažurirati svoju prijavu putem e-maila ili SMS poruke." -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Pažnja: Ovaj prijavak je poslan nadležnima na rješavanje. Naknadne izmjene neće biti automatski proslijeđene. " -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Pažnja: Ovaj prijavak još nije poslan nadležnima na rješavanje. Naknadne izmjene možda neće biti automatski proslijeđene. " @@ -259,21 +259,21 @@ msgstr "Uključite dvo-stupanjsku provjeru za prijavu u sustav" msgid "Add" msgstr "Dodajte" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "Dodajte tijelo za svako tijelo javne vlasti, poput jedinice mjesne samouprave ili nekog ureda kojem se mogu slati prijave o problemima. Možete dodati jednu ili više kontaktnih adresa (za različite kategorije problema) za svako administrativno tijelo." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Dodajte podatke za kontakt koristeći obrazac koji se nalazi ispod." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Dodajte tijelo javne vlasti" @@ -294,8 +294,8 @@ msgstr "Dodajte polja" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Dodaj novu kategoriju" @@ -310,27 +310,27 @@ msgstr "Dodajte telefonski broj" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Dodajte korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Dodajte ili uredite kategorije problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Dodajte ili uredite prioritete za odgovor" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Dodajte ili uredite predloške za odgovor" @@ -338,7 +338,7 @@ msgstr "Dodajte ili uredite predloške za odgovor" msgid "Added %s" msgstr "Dodano %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -367,7 +367,6 @@ msgstr "Javi mi buduće promjene" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -414,11 +413,15 @@ msgstr "Sve prijave između %s i %s" msgid "All time" msgstr "Sva vremena" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "Alternativno, možemo prikriti Vaše ime uz sve Vaše prijave i ažuriranjana čitavoj stranici:" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -437,9 +440,9 @@ msgid "Anonymous user" msgstr "Anonimni korisnik" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonimno:" @@ -448,29 +451,29 @@ msgstr "Anonimno:" msgid "Another user" msgstr "Drugi korisnik" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Jeste li sigurni da želite otkazati ovo slanje?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Jeste li sigurni?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Područje pokrivenosti" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Područje:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Budući da je ovo probno-eksperimentalna stranica i %sne važi, prijave poslane putem ove stranice bit će poslane osobi koja prijavljuje, a ne na adrese navedene kao nadležne za ovu kategoriju problema." @@ -491,11 +494,11 @@ msgstr "Dodijelite vanjskom tijelu:" msgid "Assign to subdivision:" msgstr "Dodijelite radnoj jedinici:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "Pridodajte korisnike određenom području:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Dodijeljeno %s" @@ -507,8 +510,8 @@ msgstr "Većinom %d su zahtjevi vraćeni na query. Vraćeni zahtjevi poredani s msgid "At the moment only searching for and looking at reports work." msgstr "Trenutačno radi samo pretraživanje i pregledavanje prijava." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "Autorizirani korisnici mogu biti povezani s kategorijama u kojima djeluju." @@ -524,7 +527,7 @@ msgstr "Automatski odgovor:" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -545,11 +548,11 @@ msgstr "Izbjegavajte objavu osobnih informacija i registarske tablice vozila" msgid "Awaiting moderation" msgstr "Čeka odluku moderatora" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Povratak" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Povratak na sve prijave" @@ -557,10 +560,10 @@ msgstr "Povratak na sve prijave" msgid "Ban user" msgstr "Zabranite korisniku pristup" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -569,17 +572,17 @@ msgstr "Tijela" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Tijelo" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Tijelo" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -595,7 +598,7 @@ msgstr "Ne možete pronaći našu e-mail adresu u svom pretincu? Provjerite svoj msgid "Can't see the map? Skip this step" msgstr "Ne možete vidjeti mapu? Preskoči ovaj korak" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -606,15 +609,15 @@ msgstr "Kategorije" msgid "Categories:" msgstr "Kategorije: " -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -627,7 +630,7 @@ msgstr "Kategorija" msgid "Category and State" msgstr "Kategorija i stanje" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategorija promijenjena iz \"%s\" u \"%s\"" @@ -637,9 +640,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr " Postotak popravaka za kategoriju > staro 4 tjedna" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -666,11 +669,11 @@ msgstr "Promijenite lozinku" msgid "Change phone number" msgstr "Promijenite telefonski broj" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "Uključite potrebna provjeraako prijave u ovoj kategoriju moraju proći provjeru prije nego se proslijede na postupanje." -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -686,17 +689,17 @@ msgstr "" "
\n" "Ovo je primjereno za probleme za koje želite omogućiti korisnicima da prijave nadležnim tijelima, ali za koje nema velikog interesa javnosti da se prikazuje u izvještaju. Obično to može biti zahtjev za uslugama poput postavljanja dodatne kante za smeće na određenoj adresi." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Odaberite ime kategorije koje ima smisla za javnost (\"rupa na cesti\", \"javna rasvjeta\" i slično), a korisno je i za nadležno tijelo koje bi trebalo riješiti problem. Ovi nazivi kategorija pojavit će se u padajućem izborniku na stranici za prijavu problema." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "Odaberite iduće" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "Izbrišite preuzete podatke (offline data)" @@ -728,9 +731,13 @@ msgstr "Kliknite na poveznicu u e-mailu koji smo Vam poslali kako biste se prija msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -774,17 +781,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "Kod / šifra (code)" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "Umanjite prikaz karte" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguracija" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Potvrdi" @@ -805,9 +812,9 @@ msgstr "Provjerite svoj e-mail pretinac i postavite novu lozinku." msgid "Confirmation" msgstr "Potvrda" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Potvrđeno" @@ -837,7 +844,11 @@ msgstr "Kontaktiraj tim" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -846,12 +857,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinate" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Nepoznati korisnik" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Nismo mogli pronaći lokaciju" @@ -859,9 +870,11 @@ msgstr "Nismo mogli pronaći lokaciju" msgid "Council" msgstr "Vijeće" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Kontakti vijeća za %s" @@ -890,8 +903,8 @@ msgstr "Kreiraj izvješće" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Kreiraj kategoriju" @@ -899,15 +912,15 @@ msgstr "Kreiraj kategoriju" msgid "Create priority" msgstr "Izradite prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "Izradite izvještaj ili ažurirajte problem kao anonimni korisnik" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "Izradite izvještaj ili ažurirajte problem kao tijelo javne vlasti" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "Izradite izvještaj ili ažurirajte problem u ime korisnika" @@ -921,7 +934,7 @@ msgstr "Izradite predložak" msgid "Created" msgstr "Kreirano" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -944,12 +957,12 @@ msgstr "Trenutni token:" msgid "Currently grouped by %s" msgstr "Trenutno grupirano prema %s" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Trenutno nema izrađenih profila tijela javnih vlasti." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Ne možemo kontaktirati mušteriju" @@ -977,32 +990,32 @@ msgstr "Zadano" msgid "Default priority" msgstr "Zadani prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "Vrsta nepravilnosti" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Izbrišite predložak" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Izbrisano" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "Opišite zašto ste odlučili moderirati ovo" @@ -1018,18 +1031,18 @@ msgstr "Opis" msgid "Description:" msgstr "Opis" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "Detaljni opis ograničen je na %dznakova." -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detalji" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1040,7 +1053,7 @@ msgstr "Detalji:" msgid "Device and Site" msgstr "Uređaj i stranica" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Prenešeno" @@ -1049,24 +1062,24 @@ msgstr "Prenešeno" msgid "Didn't use map" msgstr "Karta nije bila korištena" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Ljestvica marljivosti" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "Odbacite izmjene" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Nemojte slati e-mail obavijesti o komentarima autoru prijave" @@ -1075,7 +1088,7 @@ msgstr "Nemojte slati e-mail obavijesti o komentarima autoru prijave" msgid "Do you have a %s password?" msgstr "Imate li svoju lozinku?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "Želite li automatski prijaviti nepravilnost?" @@ -1083,7 +1096,7 @@ msgstr "Želite li automatski prijaviti nepravilnost?" msgid "Don’t know" msgstr "Ne’znam" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Ne dopadaju Vam se obrasci?" @@ -1091,19 +1104,19 @@ msgstr "Ne dopadaju Vam se obrasci?" msgid "Down one" msgstr "Jedan manje" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Povucite i postavite fotografije ovamo ili kliknite za slanje sa svog računala" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "Duplikat s" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "Duplikati" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1114,8 +1127,8 @@ msgstr "" "Različite kateogrije mogu imati istu kontakt adresu.\n" "To znači da možete imati niz različitih kategorija iako imate samo jednu kontakt-adresu nadležnog tijela javne vlasti." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1123,23 +1136,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Uredi" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Uredite podatke o tijelu javne vlasti" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "Uredite ovlaštenja drugih korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Uredite kategoriju kojoj pripada prijava" @@ -1147,15 +1160,15 @@ msgstr "Uredite kategoriju kojoj pripada prijava" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Uredite razinu prioriteta ove prijave" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Uredite prijave" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1178,28 +1191,28 @@ msgstr "Uređivanje problema %d" msgid "Editing update %d" msgstr "Uređivanje ažuriranja %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Uređivane korisnika %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Urednik" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-mail" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1228,37 +1241,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "Potvrđena e-mail adresa:" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "E-mail:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1266,8 +1279,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1275,16 +1288,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1292,7 +1305,7 @@ msgstr "" msgid "End Date" msgstr "Zaključni datum" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Krajnja točka" @@ -1314,10 +1327,6 @@ msgstr "Unesite obližnji poštanski broj ili ime ulice i kvarta" msgid "Enter a nearby street name and area" msgstr "Unesite ime obližnje ulice i kvarta" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Unesite detalje o problemu" @@ -1331,13 +1340,13 @@ msgstr "Unesite detalje o problemu" msgid "Error" msgstr "Greška" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Sve" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Primjer poštanskog broja %s" @@ -1349,11 +1358,11 @@ msgstr "Primjeri:" msgid "Existing category" msgstr "Postojeća kategorija" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "Proširite prikaz karte" @@ -1370,7 +1379,7 @@ msgstr "Izvoz u CSV formatu" msgid "External ID" msgstr "Vanjski ID / IB" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "Vanjski URL" @@ -1391,25 +1400,25 @@ msgstr "" msgid "External team" msgstr "Vanjska ekipa" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "Dodatna polja" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Dodatni podaci:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Dodatni detalji" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1432,11 +1441,12 @@ msgstr "" msgid "Filter report list" msgstr "Filtriranje popisa prijava" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Prvi put" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Popravite ovo tako da odaberete područje pokrivenosti u obrascu za uređenje podataka za tijelo javne vlasti ispod." @@ -1456,9 +1466,9 @@ msgstr "Popravljeno - odgovorno tijelo" msgid "Fixed - User" msgstr "Popravljeno - Korisnik" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Zastavica je izbrisana" @@ -1466,8 +1476,8 @@ msgstr "Zastavica je izbrisana" msgid "Flag user" msgstr "Označi korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Označen" @@ -1475,7 +1485,7 @@ msgstr "Označen" msgid "Flagged reports and users" msgstr "Označene prijave i korisnici" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Označeni korisnici su izlistani na zasebnoj stranici." @@ -1484,7 +1494,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Označeni korisnici nisu ograničeni ni na koji način. To je samo popis korisnika na koje treba obratiti pozornost." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Označen:" @@ -1500,7 +1510,7 @@ msgstr "Bilo bi najbolje poslati fotku izdaleka te iz blizine." msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1514,11 +1524,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Zaboravili ste šifru?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Proslijeđeno vanjskom tijelu." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "Proslijeđeno vanjskom tijelu." @@ -1534,6 +1544,8 @@ msgstr "Izradite token" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Primite ažuriranja" @@ -1564,9 +1576,9 @@ msgstr "Drago nam je čuti da je stvar riješena!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1576,7 +1588,7 @@ msgstr "Idi" msgid "Going to send questionnaire?" msgstr "Pošalji upitnik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "Odobri pristup adminu" @@ -1584,7 +1596,7 @@ msgstr "Odobri pristup adminu" msgid "Graph of problem creation by status over time" msgstr "Grafikon nastanka problema prema položaju tijekom vremena" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1635,11 +1647,11 @@ msgstr "Skriveno" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "Sakriti sve prijave i novosti" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "Sakriti cijelu prijavu" @@ -1660,9 +1672,9 @@ msgstr "Sakrijte svoje ime u ovom ažuriranju novosti" msgid "Hide my name on this report" msgstr "Sakrijte svoje ime u ovoj prijavi" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Sakrij pinove" @@ -1679,11 +1691,11 @@ msgstr "Sakriti Vaše ime?" msgid "Hint" msgstr "Savjet" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Povijest" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "" @@ -1691,7 +1703,7 @@ msgstr "" msgid "How to report a problem" msgstr "Kako prijaviti problem:" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Kako sastaviti što uspješniju prijavu" @@ -1713,7 +1725,7 @@ msgstr "Nažalost, ne možemo locirati Vaš problem u bazi podataka.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1722,8 +1734,8 @@ msgstr "Nažalost, ne možemo locirati Vaš problem u bazi podataka.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1745,13 +1757,13 @@ msgstr "Ako je ova postavka uključena, korisnik neće vidjeti polje za unos, ne msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "Ako je ova postavka uključena, ovaj predložak će biti korišten za ažuriranja u vezi Open311 !!!" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Ako više tijela javne vlasti ima nadležnost na istom prostoru, @PopraviKv.art spaja iste kategorije u jednu stavku na izborniku. Budite sigurni da koristite isti naziv kategorije u tijelima javne vlasti ako želite da se to dogodi." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1763,6 +1775,10 @@ msgstr "Ako generirate novi token, onda će postojeći prestati raditi." msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Ako dobijete nove informacije o stanju prijavljenog problema, molimo Vas da se vratite na ovu stranicu i ažurirate prijavu ili stanje problema." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Ako želite da ovaj prioritet !!! bude opcija samo za određene kategorije, ovdje ih odaberite. Inače je zadano da budu prikazani za sve kategorije." @@ -1790,34 +1806,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "Ako želite ostaviti javni komentar o novostima u vezi prijavljenog problema, molimo Vas da to upišete ovdje. (Imajte na umu da ovaj komentar neće automatski biti proslijeđen nadležnoj instituciji.)" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Ako za slanje koristite neki alat koji nije e-mail, unesite ovdje ID usluge (Open311) ili sličan identifikator." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Ilegalan ID" @@ -1825,7 +1841,7 @@ msgstr "Ilegalan ID" msgid "Illegal feed selection" msgstr "Ilegalan odabir izvora" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1837,7 +1853,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Nadalje, sljedeća svojstva koja nisu dio Open311 v2 specifikacija su vraćena: agencijski _poslano_datum-vrijeme, naslov (također vraćen kao dio opisa), sučelje_korišteno, brojač_komentara, ime_pretražitelja(prisutno samo ako je tražitelj dopustio prikaz imena na ovoj stranici)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "Neaktivno" @@ -1853,15 +1869,15 @@ msgstr "Uključite osobne podatke prijavitelja" msgid "Incorrect has_photo value \"%s\"" msgstr "Pogrešno ima_foto vrijednost\"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "Provjerite prijavu" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "Potrebna provjera" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "Izdajte nalog izvođačima da riješe prijavljene probleme" @@ -1869,7 +1885,7 @@ msgstr "Izdajte nalog izvođačima da riješe prijavljene probleme" msgid "Internal notes" msgstr "Interne bilješke" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "Greška u vezi s internetima" @@ -1877,12 +1893,12 @@ msgstr "Greška u vezi s internetima" msgid "Invalid agency_responsible value %s" msgstr "Nevažeća odgovorna_vrijednost agencije %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Naveden nevažeći %s format." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "Neispravna lokacija. Nova lokacija treba biti unutar područja pokrivenosti tijela javne vlasti." @@ -1903,7 +1919,7 @@ msgstr "" msgid "Label" msgstr "Oznaka" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "Jezik" @@ -1916,8 +1932,8 @@ msgstr "Jezici" msgid "Last 7 days" msgstr "Posljednjih 7 dana" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Posljednji " @@ -1933,17 +1949,17 @@ msgstr "Posljednje ažuriranje" msgid "Last update:" msgstr "Posljednje ažuriranje:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "Geografska širina / duljina" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "Najdavnije uređeno" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Ostavite ovo prazno ako sve prijave ovom tijelu javne vlasti trebaju biti poslane istom metodom (npr. \"%s\")." @@ -1951,7 +1967,7 @@ msgstr "Ostavite ovo prazno ako sve prijave ovom tijelu javne vlasti trebaju bit msgid "List" msgstr "Popis" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Izlistaj sve prijavljene probleme" @@ -1995,16 +2011,16 @@ msgstr "Prijavite se Facebook računom" msgid "Log in with Twitter" msgstr "Prijavite se Twitter računom" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Prijavite se e-mail računom" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "Prijavite se e-mailom ili SMS-om" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "Odjavite se s cijele stranice" @@ -2012,23 +2028,23 @@ msgstr "Odjavite se s cijele stranice" msgid "Look up" msgstr "Potražite" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "KARTA !!!" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "Anonimizirajte korisnika !!! kod svih prijava i ažuriranja novosti" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "Ručni poredak" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Karta" @@ -2036,15 +2052,15 @@ msgstr "Karta" msgid "Mark as sent" msgstr "Označite kao poslano" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Označite korisnike na čije ponašanje želite obratiti pažnju." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Poruka" @@ -2060,19 +2076,19 @@ msgstr "Poruka vanjskom tijelu:" msgid "Missing bodies:" msgstr "Nedostajuća tijela:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Nedostaje nadležni_ID" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Moderirajte" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "Moderirajte detalje prijave" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Moderirajte ovu prijavu" @@ -2080,10 +2096,10 @@ msgstr "Moderirajte ovu prijavu" msgid "Moderate this update" msgstr "Moderirajte ovo ažuriranje novosti" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "Moderirao/la %s u %s" @@ -2101,12 +2117,12 @@ msgstr "" msgid "Month" msgstr "Mjesec" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Najviše komentara" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2118,11 +2134,11 @@ msgstr "Najviše komentara" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2131,7 +2147,7 @@ msgstr "Ime" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Ime:" @@ -2141,11 +2157,11 @@ msgstr "Ime:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Pogledajte ovaj problem" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "Najbliža procijenjena adresa:" @@ -2157,7 +2173,7 @@ msgstr "Najbliža imenovana cesta smještena pokraj oznake na karti (automatski msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Najbliži poštanski broj pokraj oznake na karti (automatski generiran): %s (%sm udaljenosti)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Najbliža cesta smještena pokraj oznake na karti (automatski generirano pomoću Bing Maps): %s" @@ -2183,11 +2199,11 @@ msgstr "Skoro gotovo! Sada pogledajte svoj e-mail sandučić..." msgid "Nearly done! Now check your phone…" msgstr "Skoro gotovo! Sada pogledajte svoj telefon..." -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Dodano novo tijelo javne vlasti" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Novi kontakt dodan u kategoriju" @@ -2223,23 +2239,23 @@ msgstr "Novi broj telefona:" msgid "New priority" msgstr "Novi prioritet" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2247,7 +2263,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Novi problemi za {{COUNCIL}} unutar{{WARD}} na Popravi.to" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2283,11 +2299,11 @@ msgstr "Novo stanje" msgid "New template" msgstr "Novi predložak" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Najnovije" @@ -2299,10 +2315,10 @@ msgstr "Sljedeće" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2310,11 +2326,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Ne" @@ -2322,11 +2337,7 @@ msgstr "Ne" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Bez područja" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Nema tijela javne vlasti" @@ -2334,7 +2345,7 @@ msgstr "Nema tijela javne vlasti" msgid "No council selected" msgstr "Nije odabrano odgovorno tijelo" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Nikakve izmjene još nisu napravljenje." @@ -2351,11 +2362,11 @@ msgstr "Nisu pronađeni posebno označeni korisnici." msgid "No further updates" msgstr "Nema novosti" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "Navedeni inspektor nema zabilježenih nadzora u zadanom periodu." -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "Nisu zabilježeni nadzori u navedenom periodu." @@ -2363,12 +2374,12 @@ msgstr "Nisu zabilježeni nadzori u navedenom periodu." msgid "No reports to show on map, here are some nearby:" msgstr "Nema prijava za prikazati na karti, no evo nekih u blizini:" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Nisu pronađeni traženi rezultati !!!" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2385,15 +2396,15 @@ msgstr "Bez podrške" msgid "None" msgstr "Nijedan" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2413,13 +2424,13 @@ msgstr "Nije prethodno prijavljeno" msgid "Not reported to council" msgstr "Nije prijavljeno odgovornom tijelu" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Napomena" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Napomena:" @@ -2443,15 +2454,15 @@ msgstr "Broj prijavljenih problema u svakoj kategoriji, unutar posljenjih 7 dana msgid "Number of problems reported in each ward, in the last 7 days." msgstr "Broj problema u pojedinoj samoupravi, u posljednjih 7 dana" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "Preuzeti podaci su izbrisani" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "Preuzeti podaci su sačuvani" @@ -2459,16 +2470,16 @@ msgstr "Preuzeti podaci su sačuvani" msgid "Old state" msgstr "Staro stanje" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Najstarije" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "U ime %s" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2479,7 +2490,7 @@ msgstr "U ime %s" msgid "Open" msgstr "Otvorene" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2487,7 +2498,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API za Popravi.to server" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2519,17 +2530,17 @@ msgstr "Ili se pretplatite na RSS izvor" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Drugo" @@ -2554,8 +2565,8 @@ msgstr "Vlasnik" msgid "Page Not Found" msgstr "Stranica nije pronađena" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "" @@ -2569,19 +2580,19 @@ msgstr "Djelomično" msgid "Password (optional)" msgstr "Lozinka (neobvezno)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Stalna poveznica (permalink)" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Ovlaštenja:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "Telefonski prijavitelj" @@ -2601,17 +2612,16 @@ msgstr "Telefonski broj (neobavezan)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "Provjeren broj telefona:" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefon:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2622,6 +2632,7 @@ msgstr "Telefon:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2636,7 +2647,7 @@ msgstr "Fotografija" msgid "Photo is required." msgstr "Potrebna je fotografija" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Potrebna je fotografija" @@ -2665,11 +2676,15 @@ msgstr "Odaberite svoje tijelo javne vlasti" msgid "Pick your ward" msgstr "Odaberite svoju jedinicu lokalne samouprave" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Postavite zastavicu na kartu" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Molimo da budete jasni i jezgroviti." @@ -2686,7 +2701,7 @@ msgstr "Provjeri lozinku i pokušaj ponovno" msgid "Please check your email address is correct" msgstr "Provjerite je li vaša e-mail adresa točna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2694,11 +2709,11 @@ msgstr "Provjerite je li vaša e-mail adresa točna" msgid "Please check your phone number is correct" msgstr "Molimo da provjerite je li ispravno unesen broj telefona" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Izaberite kategoriju" @@ -2707,8 +2722,9 @@ msgstr "Izaberite kategoriju" msgid "Please choose a less commonly-used password" msgstr "Molimo Vas da odaberete neku rjeđe korištenu lozinku koju je teže \"hakirati\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Molimo Vas da ispravite pogreške koje se nalaze ispod" @@ -2727,13 +2743,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Molimo Vas da budete pristojni; vrijeđanje službenika u tijelu javne vlasti nanosi štetu svim budućim korisnicima ovog sustava." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Unesite poruku" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2741,90 +2757,90 @@ msgstr "Unesite poruku" msgid "Please enter a mobile number" msgstr "Molimo da ostavite broj telefona" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Molimo da unesete ime" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "Molimo da unesete ime ovog tijela javne vlasti" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Unesite lozinku" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Unesite predmet (naslov)" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Unesite valjanu e-mail adresu" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Unesite valjanu e-mail adresu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "Molimo da unesete valjanu e-mail adresu ili broj telefona" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Unesite detalje" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Unesite svoju e-mail adresu" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Unesite svoje ime" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Molimo unesite svoje puno ime, odgovorno tijelo treba ovu informaciju – ako ne želite da vaše ime bude prikazano na stranici, odznačite kvadratić ispod" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Unesite svoje ime" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Molimo da ostavite svoj broj telefona" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Unesite svoje prezime" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Unesite svoju titulu" @@ -2852,7 +2868,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Molimo navedite želite li primiti novi upitnik" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "Molimo da provjerite sastoji li se Vaša lozinka od najmanje %dznakova" @@ -2878,11 +2894,11 @@ msgstr "Molimo da imate na umu da Vaša prijava još nije objavljenareputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "Prijave će biti automatski poslane bez potrebe za moderatorskom provjerom ako je koristnička reputacija jednaka ili veća od ove vrijednosti. Postavite vrijednost na 0 ako sve prijave treba provjeriti neovisno o reputaciji korisnika." -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3470,20 +3500,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3495,15 +3525,15 @@ msgstr "Cestovni operater za ovu imenovanu cestu (izveden iz cestovnog referentn msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Cestovni operater za ovu imenovanu cestu (sa OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3514,23 +3544,23 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Spremi promjene" @@ -3539,12 +3569,12 @@ msgstr "Spremi promjene" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3554,7 +3584,8 @@ msgstr "" msgid "Search Reports" msgstr "Pretraži prijave" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Pretraži korisnike" @@ -3563,7 +3594,7 @@ msgid "Search reports" msgstr "" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Pretraži:" @@ -3573,7 +3604,7 @@ msgstr "Pretraži:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3589,17 +3620,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "" @@ -3619,15 +3651,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3636,7 +3668,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3663,7 +3695,7 @@ msgstr "Servis:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3672,9 +3704,9 @@ msgid "Share" msgstr "Podijeli" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3682,15 +3714,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3702,7 +3734,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Prikaži moje ime javno" @@ -3714,21 +3746,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Prikaži pinove" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3771,8 +3803,8 @@ msgstr "Odjavite se" msgid "Some categories may require additional information." msgstr "Neke kategorije mogu zahtijevati dodatne informacije." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3787,6 +3819,14 @@ msgstr "Fotografije nedavnih prijava" msgid "Some text to localize" msgstr "Tekst za lakšu lokalizaciju" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Žao nam je,ne pokrivamo područje na kojem se nalazi taj problem." @@ -3804,7 +3844,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Žao nam je, došlo je do greške pri potvrđivanju problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3826,7 +3866,7 @@ msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokušajte pon msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3836,15 +3876,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Kriterij sortiranja" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3852,31 +3892,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Stanje" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3889,14 +3930,14 @@ msgstr "" msgid "State:" msgstr "Stanje:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3912,7 +3953,7 @@ msgid "Status" msgstr "" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3925,7 +3966,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3933,12 +3974,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Predmet" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Predmet:" @@ -3956,7 +3997,7 @@ msgstr "Pošalji" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3977,7 +4018,8 @@ msgstr "" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Pretplati se" @@ -3985,21 +4027,29 @@ msgstr "Pretplati se" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "Ukratko opišite svoj problem:" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "Ukratko opišite unesene izmjene" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4019,11 +4069,11 @@ msgstr "Sažetak prijava" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "Super-korisnici imaju ovlasti da poduzimaju sve radnje u administratorskom sučelju." @@ -4041,8 +4091,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4052,7 +4102,7 @@ msgstr "Predlošci" msgid "Text" msgstr "Tekst" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Tekst samo verzija" @@ -4096,7 +4146,7 @@ msgstr "Hvala, drago nam je čuti da je Vaš problem riješen! Htjeli bismo Vass msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Slika nije ispravno učitana (%s), molimo pokušajte ponovno." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Odgovorno tijelo ne pokriva navedenu lokaciju, možda je riječ o obalnom dijelu ili je izvan zemlje. Molimo pokušajte ponovno." @@ -4110,11 +4160,11 @@ msgstr "Lokacija se ne nalazi u Hrvatskoj. Molimo pokušajte ponovno." msgid "That postcode was not recognised, sorry." msgstr "Žao nam je, poštanski broj nije prepoznat." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Ovaj problem ima oznaku da je poslan nadležnom tijelu na postupanje." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Navedeni problem će biti ponovno poslan" @@ -4126,23 +4176,23 @@ msgstr "Ovaj izvještaj se ne može pregledati na %s." msgid "That report has been removed from FixMyStreet." msgstr "Navedena prijava je uklonjena s Popravi.to" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "Taj korisnik se odjavio iz sustava." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "Osobni podaci tog korisnika su anonimizirani u svim prijavama i ažuriranjima." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "Osobni podaci tog korisnika su uklonjeni." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "Prijave i ažuriranja od strane tog korisnika su označene kao sakrivene." -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4150,31 +4200,31 @@ msgstr "" "Na ovu e-mail adresu će se slati prijave iz ove kategorije. \n" "Pažnja: I neke druge kategorije iz nadležnosti ovog tijela javne vlasti možda imaju istu adresu." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4184,8 +4234,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Open311 v2 atribut agency_responsible koristi se za popis uprava koje su zaprimile prijavu problema te ne odgovara posve načinu na koji je atribut definiran u specifikaciji Open311 v2." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4200,12 +4250,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Nadležno tijelo Vam vjerojatno neće moći pomoći u vezi ovog problema ako ne ostavite što više korisnih detalja. Molimo Vas da precizno opišete lokaciju problema, što je točno problem, koliko je dugo prisutan (ako znate), te Vas molimo da nam pošaljete fotografiju problema ako ju imate." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Greška je: %s" @@ -4251,7 +4301,7 @@ msgstr "Posljednji prijavljeni problemi za {{IME}}" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Poveznica je možda istekla, ili ju niste posve točno upisali." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Popis dostupnih područja preuzet je sa servisa MapIt %s." @@ -4272,20 +4322,20 @@ msgstr "Traženi URL '%s' nije pronađen na ovom serveru" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Korisnik nije mogao locirati problem na karti, ali možete vidjeti područje oko navedene lokacije" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4297,7 +4347,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Nemamo Vaših prijava za prikaz." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "Već postoji predložak za automatsko odgovaranje za ovu kategoriju ili stanje." @@ -4305,8 +4359,8 @@ msgstr "Već postoji predložak za automatsko odgovaranje za ovu kategoriju ili msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Došlo je do problema pri učitavanju svih prijava. Molimo pokušajte ponovno." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Došlo je do problema pri učitavanju ove stranice. Molimo pokušajte ponovno." @@ -4328,7 +4382,7 @@ msgstr "Pojavio se neki problem u vezi s Vašim podacima za prijavu. Ako se ne m msgid "There was a problem with your update. Please try again." msgstr "Došlo je do problema pri ažuriranju. Molimo pokušajte ponovno." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Došlo je do problema pri prijavi. Detalje pogledajte u nastavku." @@ -4345,8 +4399,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4355,7 +4409,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4373,36 +4427,35 @@ msgstr "Ove prijave će biti poslane %s te javno vidljive ostal msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Razvoj API implementacije je u tijeku te još nije stabilizrana. Ubuduće će se mijenjati bez upozorenja." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "Ovo tijelo javne vlasti nije nadležno za nikakav prostor. To znači da nema nadležnost " -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Kako korisnik nije kategorizirao problem, ovaj e-mail je automatski poslan na odgovornim tijelima koja pokrivaju mjesto problema. Molimo Vas da zanemarite e-mail ako problem ne ulazi u Vašu nadležnost ili nam se povratno javite kako bismo u svom sustavu mogli ispravno kategorizirati prijavu." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Kako je odabrana kategorija predviđena za više odgovornih tijela, ovaj e-mail poslan je na adrese nekoliko ureda koje prekrivaju mjesto problema. Molimo Vas da zanemarite e-mail ako problem ne ulazi u Vašu nadležnost ili nam se povratno javite kako bismo u svom sustavu mogli ispravno kategorizirati prijavu." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Potrebna informacija" @@ -4419,7 +4472,11 @@ msgstr "Ovo je stranica za razvojne programere; ovdje se sve može prekinuti u b msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4435,12 +4492,16 @@ msgstr "Problem još nije riješen." msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4461,7 +4522,7 @@ msgstr "Prijava je trenutno označena kao otvorena." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Stranica sadrži i fotografiju problem, dodanu od strane korisnika." @@ -4472,7 +4533,7 @@ msgstr "Stranica sadrži i fotografiju problem, dodanu od strane korisnika." msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Vremenska skala" @@ -4510,7 +4571,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Karta točne lokacije ovog problema" @@ -4539,34 +4600,34 @@ msgstr "5 najboljih JLS" msgid "Total" msgstr "Ukupno" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "" @@ -4585,16 +4646,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4612,7 +4673,7 @@ msgstr "Nepoznat tip upozorenja" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "" @@ -4625,7 +4686,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "Nepoznat IB problema" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4638,7 +4699,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Ažuriranje" @@ -4647,16 +4708,16 @@ msgstr "Ažuriranje" msgid "Update %s created for problem %d; by %s" msgstr "Problem %s ažurirao %d; korisnik %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Ažuriranje u nastavku dodao je anonimni korisnik u %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Ažuriranje u nastavku dodao %s u %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4681,7 +4742,7 @@ msgstr "Označite problem kao popravljen / riješen." msgid "Update reopened problem" msgstr "Ažuriranjem je problem ponovno otvoren" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Status ažuriranja" @@ -4699,14 +4760,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Ažurirano!" @@ -4731,12 +4792,12 @@ msgstr "Ažuriranja za {{naslov}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4746,15 +4807,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4763,48 +4824,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "Korisnik je dodan na popis zloupotreba." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Korisnička oznaka uklonjena" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Korisnik označen" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4813,20 +4874,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Korisnici" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Vrijednosti ažurirane" @@ -4860,12 +4921,12 @@ msgstr "Pregled prijava za ward" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Prikaz lokacije" @@ -4900,7 +4961,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Shvaćamo da bi za ovaj problem moglo biti odgovorno% s, međutim, trenutno nemamo nikakve pojedinosti o njihovom kontaktu. Ako znate odgovarajuću kontakt adresu, molimo Vas da nam se javite." @@ -4915,8 +4976,8 @@ msgstr "Prikazujemo najviše deset približnih rezultata. Ako se Vaš traženi r #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Vaše privatne podatke koristimo u skladu s našim pravilima o privatnosti." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4930,8 +4991,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Prilikom ažuriranja" @@ -4951,14 +5016,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4979,15 +5040,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Želite li za 4 tjedna primiti još jedan upitnik koji bi Vas podsjetio da provjerite status?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Podsjećamo, pisanje velikim tiskanim slovima i bez interpunkcijskih znakova čini poruku teško čitljivom." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4996,20 +5061,19 @@ msgstr "Podsjećamo, pisanje velikim tiskanim slovima i bez interpunkcijskih zna #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Da" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5017,7 +5081,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Sljedeće izvješće o problemu prijavljujete jer je uvredljivo, sadrži osobne podatke ili slično:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Sljedeće ažuriranje prijavljujete jer je uvredljivo, sadrži osobne podatke ili slično:" @@ -5030,7 +5094,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5038,7 +5102,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5056,15 +5120,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Možete nam pomoći u pronalaženju kontakt e-mail adresa za lokalne probleme %s i poslati nam ih e-mailom na %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5130,7 +5194,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5152,9 +5216,10 @@ msgstr "Vaš profil" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Vaša e-mail adresa:" @@ -5170,10 +5235,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Vaše informacije će se koristiti isključivo u skladu s našim pravilima o privatnosti" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Ime" @@ -5189,7 +5254,7 @@ msgstr "Vaše ime je sakriveno u svim Vašim prijavama i poslanim novostima" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5212,7 +5277,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Vaš broj telefona" @@ -5237,7 +5302,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5254,25 +5319,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5306,8 +5370,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5316,12 +5380,12 @@ msgstr "" msgid "from %s different users" msgstr "od %s različitih korisnika" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "manje od minute" @@ -5332,7 +5396,7 @@ msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5372,7 +5436,7 @@ msgstr "" msgid "other areas:" msgstr "druga područja:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5380,7 +5444,7 @@ msgstr "" msgid "sign out" msgstr "odjavite se" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5397,19 +5461,19 @@ msgstr "nema oznake jer korisnik nije označio problem na karti" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "ovaj tip " -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "danas" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5425,11 +5489,11 @@ msgstr "Korisnik je iz istog područja kao i problem - %d" msgid "user is problem owner" msgstr "korisnik je vlasnik problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5438,7 +5502,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5446,7 +5510,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5454,7 +5518,7 @@ msgstr[0] "%d dan" msgstr[1] "%d dani" msgstr[2] "%d dani" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5462,7 +5526,7 @@ msgstr[0] "%d sat" msgstr[1] "%d sati" msgstr[2] "%d sati" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5470,7 +5534,7 @@ msgstr[0] "%d minuta" msgstr[1] "%d minute" msgstr[2] "%d minute" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5486,7 +5550,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5494,7 +5558,7 @@ msgstr[0] "%d tjedan" msgstr[1] "%d tjedni" msgstr[2] "%d tjedni" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5574,7 +5638,7 @@ msgstr[0] "%s ažuriranje za prijavu" msgstr[1] "%s ažuriranja za prijavu" msgstr[2] "%s novosti u vezi prijava" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5598,7 +5662,7 @@ msgstr[0] "Još uvijek nemamo podatke za odgovorno tijelo koja pokriva ovu lokac msgstr[1] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju." msgstr[2] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po index 81a4dbdca9d..d86e5f9f3fe 100644 --- a/locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/hu_HU.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Hungarian (Hungary) (https://www.transifex.com/mysociety/teams/12067/hu_HU/)\n" "Language: hu_HU\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr " és " -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr " és " msgid " or " msgstr " vagy " -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "maximum %d karakter" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "" @@ -48,7 +48,7 @@ msgstr "" msgid "%d to %d of %d" msgstr "" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "" msgid "(no longer exists)" msgstr "(nem létezik többé)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "" @@ -163,11 +163,11 @@ msgstr "" msgid "(optional)" msgstr "(opcionális)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "" @@ -176,13 +176,13 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Válassz kategóriát --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "--Válassz mintát--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%s elmentve." @@ -232,11 +232,11 @@ msgstr "" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "Kétfaktoros azonosítás aktiválása" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "" @@ -291,8 +291,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "" @@ -307,27 +307,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -335,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "" @@ -445,29 +448,29 @@ msgstr "" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Terület:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -488,11 +491,11 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "" @@ -504,8 +507,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Vissza" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -554,10 +557,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -592,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -678,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -720,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,17 +773,17 @@ msgstr "" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "" @@ -797,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "" @@ -829,7 +836,11 @@ msgstr "" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -838,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "" @@ -851,9 +862,11 @@ msgstr "" msgid "Council" msgstr "" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "" @@ -882,8 +895,8 @@ msgstr "" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "" @@ -891,15 +904,15 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +926,7 @@ msgstr "" msgid "Created" msgstr "" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -936,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -969,32 +982,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1010,18 +1023,18 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1032,7 +1045,7 @@ msgstr "" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -1041,24 +1054,24 @@ msgstr "" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1067,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1083,19 +1096,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1103,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1112,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1136,15 +1149,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1167,28 +1180,28 @@ msgstr "" msgid "Editing update %d" msgstr "" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1217,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1255,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1264,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1281,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1303,10 +1316,6 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "" @@ -1320,13 +1329,13 @@ msgstr "" msgid "Error" msgstr "" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "" @@ -1338,11 +1347,11 @@ msgstr "" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1359,7 +1368,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1380,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1421,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1445,9 +1455,9 @@ msgstr "" msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "" @@ -1455,8 +1465,8 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "" @@ -1464,7 +1474,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1473,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "" @@ -1489,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1503,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1523,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "" @@ -1553,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1565,7 +1577,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1624,11 +1636,11 @@ msgstr "" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1649,9 +1661,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "" @@ -1668,11 +1680,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "" @@ -1680,7 +1692,7 @@ msgstr "" msgid "How to report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "" @@ -1702,7 +1714,7 @@ msgstr "" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1711,8 +1723,8 @@ msgstr "" msgid "ID" msgstr "" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1734,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1752,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1779,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "" @@ -1814,7 +1830,7 @@ msgstr "" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1826,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1842,15 +1858,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1858,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1866,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1892,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1905,8 +1921,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "" @@ -1922,17 +1938,17 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1940,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "" @@ -1984,16 +2000,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2001,23 +2017,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2025,15 +2041,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "" @@ -2049,19 +2065,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2069,10 +2085,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2090,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2107,11 +2123,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2120,7 +2136,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "" @@ -2130,11 +2146,11 @@ msgstr "" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2146,7 +2162,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2170,11 +2186,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "" @@ -2210,23 +2226,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2234,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2270,11 +2286,11 @@ msgstr "" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2286,10 +2302,10 @@ msgstr "" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2297,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "" @@ -2309,11 +2324,7 @@ msgstr "" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "" @@ -2321,7 +2332,7 @@ msgstr "" msgid "No council selected" msgstr "" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "" @@ -2338,11 +2349,11 @@ msgstr "" msgid "No further updates" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2350,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2372,15 +2383,15 @@ msgstr "" msgid "None" msgstr "" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2400,13 +2411,13 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "" @@ -2430,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2446,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2466,7 +2477,7 @@ msgstr "" msgid "Open" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2474,7 +2485,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2506,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "" @@ -2541,8 +2552,8 @@ msgstr "" msgid "Page Not Found" msgstr "" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "" @@ -2556,19 +2567,19 @@ msgstr "" msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2588,17 +2599,16 @@ msgstr "" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2609,6 +2619,7 @@ msgstr "" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2623,7 +2634,7 @@ msgstr "" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2652,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" @@ -2673,7 +2688,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,11 +2696,11 @@ msgstr "" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "" @@ -2694,8 +2709,9 @@ msgstr "" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2711,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,90 +2741,90 @@ msgstr "" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "" @@ -2836,7 +2852,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2862,11 +2878,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2902,16 +2918,16 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "" @@ -2947,12 +2963,12 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2966,14 +2982,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2996,7 +3016,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "" @@ -3004,7 +3024,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -3029,7 +3049,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3054,8 +3074,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" @@ -3081,7 +3101,7 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3106,6 +3126,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -3129,11 +3150,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -3141,7 +3162,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3161,6 +3182,14 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3180,11 +3209,11 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3196,7 +3225,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3210,9 +3239,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3238,20 +3267,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3261,7 +3290,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3295,17 +3324,18 @@ msgid "Report, view, or discuss local problems" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -3349,28 +3379,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3382,7 +3412,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3394,15 +3424,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3410,11 +3440,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3454,20 +3484,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3479,15 +3509,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3498,23 +3528,23 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -3523,12 +3553,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3538,7 +3568,8 @@ msgstr "" msgid "Search Reports" msgstr "" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "" @@ -3547,7 +3578,7 @@ msgid "Search reports" msgstr "" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" @@ -3557,7 +3588,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3573,17 +3604,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "" @@ -3603,15 +3635,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3620,7 +3652,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3647,7 +3679,7 @@ msgstr "" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3656,9 +3688,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3666,15 +3698,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3686,7 +3718,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "" @@ -3698,21 +3730,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3755,8 +3787,8 @@ msgstr "" msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3771,6 +3803,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3788,7 +3828,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3810,7 +3850,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3820,15 +3860,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3836,31 +3876,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3873,14 +3914,14 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3896,7 +3937,7 @@ msgid "Status" msgstr "" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3909,7 +3950,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3917,12 +3958,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" @@ -3940,7 +3981,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3961,7 +4002,8 @@ msgstr "" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -3969,21 +4011,29 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4003,11 +4053,11 @@ msgstr "" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4025,8 +4075,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4036,7 +4086,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "" @@ -4080,7 +4130,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4094,11 +4144,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "" @@ -4110,53 +4160,53 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4166,8 +4216,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4182,12 +4232,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "" @@ -4233,7 +4283,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4254,20 +4304,20 @@ msgstr "" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4279,7 +4329,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4287,8 +4341,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4310,7 +4364,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -4327,8 +4381,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4337,7 +4391,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4355,36 +4409,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4401,7 +4454,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4417,12 +4474,16 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4443,7 +4504,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4454,7 +4515,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4492,7 +4553,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4521,34 +4582,34 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "" @@ -4567,16 +4628,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4594,7 +4655,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "" @@ -4607,7 +4668,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4620,7 +4681,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4629,16 +4690,16 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4663,7 +4724,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4681,14 +4742,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "" @@ -4713,12 +4774,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4728,15 +4789,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4745,48 +4806,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4795,20 +4856,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4842,12 +4903,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4882,7 +4943,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4897,7 +4958,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4912,8 +4973,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "" @@ -4933,14 +4998,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4961,15 +5022,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4978,20 +5043,19 @@ msgstr "" #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -4999,7 +5063,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5012,7 +5076,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5020,7 +5084,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5038,15 +5102,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5112,7 +5176,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5134,9 +5198,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5152,10 +5217,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "" @@ -5171,7 +5236,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5194,7 +5259,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "" @@ -5219,7 +5284,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5236,25 +5301,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5288,8 +5352,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5298,12 +5362,12 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "" @@ -5314,7 +5378,7 @@ msgid "n/a" msgstr "" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5354,7 +5418,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5362,7 +5426,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5379,19 +5443,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "ma" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5407,11 +5471,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5420,35 +5484,35 @@ msgstr "" msgid "ward" msgstr "kerület" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "%d cím" msgstr[1] "%d cím" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d nap" msgstr[1] "%d nap" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d óra" msgstr[1] "%d óra" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d perc" msgstr[1] "%d perc" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5462,14 +5526,14 @@ msgid_plural "%d supporters" msgstr[0] "%d támogató" msgstr[1] "%d támogató" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d hét" msgstr[1] "%d hét" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5539,7 +5603,7 @@ msgid_plural "%s updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5560,7 +5624,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po index a1af378040c..cbe26ea966c 100644 --- a/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/mysociety/teams/12067/id_ID/)\n" "Language: id_ID\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "dan" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "dan" msgid " or " msgstr "atau" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d suntingan oleh %s" @@ -48,7 +48,7 @@ msgstr "%d suntingan oleh %s" msgid "%d to %d of %d" msgstr "%d sampai %d dari %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -160,7 +160,7 @@ msgstr "(seperti grafiti, pembuangan ilegal, pelat beton rusak, atau lampu jalan msgid "(no longer exists)" msgstr "(tidak ada lagi)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(tidak dikirim ke dewan)" @@ -169,11 +169,11 @@ msgstr "(tidak dikirim ke dewan)" msgid "(optional)" msgstr "(opsional)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(dikirim ke dua-duanya)" @@ -182,13 +182,13 @@ msgstr "(dikirim ke dua-duanya)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Pilih kategori --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -196,8 +196,8 @@ msgstr "" msgid "--Choose a template--" msgstr "--Pilih template--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -212,11 +212,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "

Laporan, Statistik, dan Tindakan untuk

%s

" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%s disimpan." @@ -241,11 +241,11 @@ msgstr "Tidak Biarkan saya mengonfirmasikan pembaruan saya mela msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Catatan: Laporan ini telah diteruskan untuk ditindaki. Perubahan apa pun yang dibuat tidak akan diteruskan." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Catatan: Laporan ini belum diteruskan untuk ditindaki. Perubahan apa pun yang dibuat tidak akan diteruskan." @@ -265,8 +265,8 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -276,13 +276,13 @@ msgstr "" "ke mana laporan masalah dapat dikirimkan. Anda dapat menambahkan satu kontak atau lebih \n" "(untuk bermacam-macam kategori masalah) di setiap badan." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Tambahkan kontak dengan menggunakan formulir di bawah ini." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Tambahkan badan" @@ -303,8 +303,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Tambahkan kategori baru" @@ -319,27 +319,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Tambahkan ke daftar pendek" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Tambahkan pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Tambah/sunting kategori masalah" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Tambah/sunting prioritas tanggapan" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Tambah/sunting template tanggapan" @@ -347,7 +347,7 @@ msgstr "Tambah/sunting template tanggapan" msgid "Added %s" msgstr "%s ditambahkan" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Menambahkan laporan ini ke daftar pendek Anda akan menghapusnya dari daftar pendek %s." @@ -376,7 +376,6 @@ msgstr "Beri tahu saya tentang pembaruan mendatang" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -423,11 +422,15 @@ msgstr "Semua laporan di antara %sdan %s" msgid "All time" msgstr "Sepanjang waktu" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "Atau, kami dapat menyembunyikan nama Anda pada semua laporan dan pembaruan Anda di seluruh situs:" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -446,9 +449,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonim:" @@ -457,29 +460,29 @@ msgstr "Anonim:" msgid "Another user" msgstr "Pengguna lain" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Apakah Anda yakin ingin membatalkan unggahan ini?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Apakah Anda yakin?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Area cakupan" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Area:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Karena ini adalah situs persiapan dan %s keliru, laporan yang dibuat di situs ini akan dikirimkan ke pelapor masalah, dan bukan kepada kontak yang diberikan untuk kategori laporan." @@ -500,11 +503,11 @@ msgstr "Tetapkan ke badan eksternal:" msgid "Assign to subdivision:" msgstr "Tetapkan ke subdivisi:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "Tetapkan pengguna pada area" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Ditetapkan ke %s" @@ -516,8 +519,8 @@ msgstr "Sebagian besar permintaan %d dikembalikan ke setiap kueri. Permintaan ya msgid "At the moment only searching for and looking at reports work." msgstr "Untuk saat ini fungsi yang dapat digunakan hanya mencari dan menampilkan laporan." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "Staf pengguna yang berwenang dapat dihubungkan dengan kategori yang dioperasikannya." @@ -533,7 +536,7 @@ msgstr "Tanggapan otomatis:" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -554,11 +557,11 @@ msgstr "Hindari informasi pribadi dan pelat nomor kendaraan" msgid "Awaiting moderation" msgstr "Menunggu moderasi" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Kembali" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Kembali ke semua laporan" @@ -566,10 +569,10 @@ msgstr "Kembali ke semua laporan" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -578,17 +581,17 @@ msgstr "Badan" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Badan" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Badan:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -604,7 +607,7 @@ msgstr "Tidak dapat menemukan surel kami? Periksa folder spam Anda  – msgid "Can't see the map? Skip this step" msgstr "Tidak dapat melihat peta? Lewati langkah ini" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -615,15 +618,15 @@ msgstr "Kategori" msgid "Categories:" msgstr "Kategori:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -636,7 +639,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategori diubah dari ‘%s’ menjadi ‘%s’" @@ -646,9 +649,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Tingkat perbaikan kategori untuk masalah > 4 minggu lamanya" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -675,11 +678,11 @@ msgstr "Ubah kata sandi" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "Beri centang pada inspeksi diperlukan jika laporan dalam kategori iniharus diinspeksi sebelum dikirim." -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -697,7 +700,7 @@ msgstr "" " bukan merupakan kepentingan publik. Di UK, kami menggunakan ini untuk melayani permohonan seperti tempat sampah tambahan\n" "di alamat tertentu." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -705,11 +708,11 @@ msgstr "" "Pilih nama kategori yang dapat dipahami oleh publik (misal, \"Lubang jalan\", \"Lampu jalan\") tetapi juga berguna\n" " bagi badan. Ini akan ditampilkan pada menu dropdown di halaman laporkan-masalah." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "Pilih lainnya" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "Hapus data offline" @@ -741,9 +744,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -787,17 +794,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "Ciutkan peta" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurasi" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Konfirmasikan" @@ -818,9 +825,9 @@ msgstr "Sebaliknya, konfirmasikan melalui surel dan berikan kata sandi yang baru msgid "Confirmation" msgstr "Konfirmasi" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Dikonfirmasi" @@ -850,7 +857,11 @@ msgstr "Hubungi tim" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -859,12 +870,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinat:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Tidak dapat menemukan pengguna" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Tidak dapat menemukan lokasi" @@ -872,9 +883,11 @@ msgstr "Tidak dapat menemukan lokasi" msgid "Council" msgstr "Dewan" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Kontak dewan untuk %s" @@ -903,8 +916,8 @@ msgstr "Buat laporan" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Buat kategori" @@ -912,15 +925,15 @@ msgstr "Buat kategori" msgid "Create priority" msgstr "Buat prioritas" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "Buat laporan/pembaruan sebagai dewan" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "Buat laporan/pembaruan mewakili pengguna" @@ -934,7 +947,7 @@ msgstr "Buat template" msgid "Created" msgstr "Dibuat" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -957,12 +970,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Saat ini belum ada badan dibuat." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Pelanggan tidak dapat dihubungi" @@ -990,32 +1003,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "Tipe kerusakan" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Hapus template" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Dihapus" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "Jelaskan mengapa Anda memoderasi ini" @@ -1031,18 +1044,18 @@ msgstr "Deskripsi" msgid "Description:" msgstr "Deskripsi:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detail" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1053,7 +1066,7 @@ msgstr "Detail:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Dilimpahkan" @@ -1062,24 +1075,24 @@ msgstr "Dilimpahkan" msgid "Didn't use map" msgstr "Tidak menggunakan peta" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Tabel liga kerajinan" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "Buang perubahan" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Jangan kirimkan surel peringatan atas komentar yang diambil ke pembuat masalah" @@ -1088,7 +1101,7 @@ msgstr "Jangan kirimkan surel peringatan atas komentar yang diambil ke pembuat m msgid "Do you have a %s password?" msgstr "Apakah Anda punya kata sandi %s?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "Apakah Anda ingin melaporkan kerusakan secara otomatis?" @@ -1096,7 +1109,7 @@ msgstr "Apakah Anda ingin melaporkan kerusakan secara otomatis?" msgid "Don’t know" msgstr "Tidak tahu" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Tidak suka formulir?" @@ -1104,19 +1117,19 @@ msgstr "Tidak suka formulir?" msgid "Down one" msgstr "Turun satu tingkat" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Tarik dan lepaskan foto di sini atau klik untuk mengunggah" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "Duplikat dari" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "Duplikat" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1127,8 +1140,8 @@ msgstr "" "Kategori yang berbeda dapat berisi kontak yang sama (alamat surel).\n" "Ini berarti Anda dapat menambahkan banyak kategori sekalipun Anda hanya memiliki satu kontak untuk badan." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "Ketimuran/Keutaraan:" @@ -1136,23 +1149,23 @@ msgstr "Ketimuran/Keutaraan:" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Sunting" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Sunting detail badan" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "Sunting perizinan pengguna lain" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Sunting kategori laporan" @@ -1160,15 +1173,15 @@ msgstr "Sunting kategori laporan" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Sunting prioritas laporan" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Sunting laporan" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1191,28 +1204,28 @@ msgstr "Menyunting masalah %d" msgid "Editing update %d" msgstr "Menyunting pembaruan %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Menyunting pengguna %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Penyunting" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Surel" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1241,37 +1254,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Surel:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1279,8 +1292,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1292,8 +1305,8 @@ msgstr "" " Untuk informasi lebih lanjut, simak \n" " artikel ini." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1303,8 +1316,8 @@ msgstr "" " titik akhir (dan metode pengiriman) yang berbeda dari badan. Sebagai contoh, jika laporan untuk beberapa kategori\n" " masalah harus dikirimkan melalui surel, sementara yang lainnya dapat dikirimkan melalui Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1312,7 +1325,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Titik Akhir" @@ -1334,10 +1347,6 @@ msgstr "Masukkan kode pos, atau nama jalan dan kawasan di sekitar" msgid "Enter a nearby street name and area" msgstr "Masukkan nama jalan dan kawasan di sekitar" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Masukkan detail masalah" @@ -1351,13 +1360,13 @@ msgstr "Masukkan detail masalah" msgid "Error" msgstr "Galat" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Semuanya" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Contoh kode pos %s" @@ -1369,11 +1378,11 @@ msgstr "Contoh:" msgid "Existing category" msgstr "Kategori yang ada" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "Perluas peta" @@ -1390,7 +1399,7 @@ msgstr "Ekspor sebagai CSV" msgid "External ID" msgstr "ID eksternal" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "URL eksternal" @@ -1411,25 +1420,25 @@ msgstr "" msgid "External team" msgstr "Tim eksternal" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Data tambahan:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Detail tambahan:" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1452,11 +1461,12 @@ msgstr "" msgid "Filter report list" msgstr "Filter daftar laporan" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Pertama kali" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Atasi ini dengan memilih sebuah area cakupan pada formulir Sunting detail badan di bawah ini." @@ -1476,9 +1486,9 @@ msgstr "Diatasi - Dewan" msgid "Fixed - User" msgstr "Diatasi - Pengguna" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Tandai dihapus" @@ -1486,8 +1496,8 @@ msgstr "Tandai dihapus" msgid "Flag user" msgstr "Tandai pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Ditandai" @@ -1495,7 +1505,7 @@ msgstr "Ditandai" msgid "Flagged reports and users" msgstr "Laporan dan pengguna ditandai" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Pengguna yang ditandai ditampilkan pada halaman ditandai." @@ -1504,7 +1514,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Pengguna yang ditandai sama sekali tidak dikenakan batasan. Ini hanyalah daftar pengguna yang telah ditandai untuk dipantau." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Ditandai:" @@ -1520,7 +1530,7 @@ msgstr "Untuk hasil terbaik, sertakan foto jarak dekat dan jarak jauh" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Untuk informasi lebih lanjut, lihat Bagaimana FixMyStreet menggunakan Mapit." @@ -1534,11 +1544,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Lupa kata sandi Anda?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Diteruskan ke badan eksternal" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "Meneruskan permohonan ke badan eksternal" @@ -1554,6 +1564,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Dapatkan pembaruan" @@ -1584,9 +1596,9 @@ msgstr "Senang mengetahui masalah telah diatasi!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1596,7 +1608,7 @@ msgstr "Mulai" msgid "Going to send questionnaire?" msgstr "Akan mengirim kuesioner?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "Berikan izin akses untuk admin" @@ -1604,7 +1616,7 @@ msgstr "Berikan izin akses untuk admin" msgid "Graph of problem creation by status over time" msgstr "Grafik pembuatan masalah berdasarkan status sepanjang waktu" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1655,11 +1667,11 @@ msgstr "Tersembunyi" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "Sembunyikan seluruh laporan" @@ -1680,9 +1692,9 @@ msgstr "Sembunyikan nama saya dalam pembaruan ini" msgid "Hide my name on this report" msgstr "Sembunyikan nama saya dalam laporan ini" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Sembunyikan pin" @@ -1699,11 +1711,11 @@ msgstr "Sembunyikan nama Anda?" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Riwayat" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Beranda" @@ -1711,7 +1723,7 @@ msgstr "Beranda" msgid "How to report a problem" msgstr "Cara melaporkan masalah" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Cara mengirimkan laporan yang sukses" @@ -1733,7 +1745,7 @@ msgstr "Saya khawatir kami tidak dapat melacak masalah Anda di basis data.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1742,8 +1754,8 @@ msgstr "Saya khawatir kami tidak dapat melacak masalah Anda di basis data.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1767,7 +1779,7 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1775,7 +1787,7 @@ msgstr "" "Jika dua badan atau lebih melayani lokasi yang sama, FixMyStreet menggabungkan kategori yang identik menjadi satu entri pada\n" "menu. Pastikan Anda menggunakan nama kategori yang sama pada badan jika Anda ingin menggabungkannya." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1787,6 +1799,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Jika Anda mendapatkan informasi mengenai status masalah Anda, mohon kembali ke situs dan buat pembaruan." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Jika Anda hanya ingin prioritas ini menjadi opsi untuk kategori tertentu, pilih kategorinya di sini. Secara default, prioritas akan ditampilkan untuk semua kategori." @@ -1816,34 +1832,34 @@ msgstr "" "Jika Anda ingin menambahkan pembaruan publik pada masalah, silakan masukkan di sini\n" "(harap perhatikan bahwa ini tidak akan dikirimkan ke dewan)." -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Jika Anda tidak menggunakan surel sebagai metode pengiriman, masukkan ID layanan (Open311) atau pengenal yang setara di sini." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID tidak sah" @@ -1851,7 +1867,7 @@ msgstr "ID tidak sah" msgid "Illegal feed selection" msgstr "Pemilihan umpan tidak sah" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1863,7 +1879,7 @@ msgstr "Pada tabel penyalahgunaan?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Sebagai tambahan, atribut berikut yang bukan merupakan bagian dari spesifikasi Open311 v2 dikembalikan: agency_sent_datetime, judul (juga dikembalikan sebagai bagian dari deskripsi), interface_used, comment_count, requestor_name (hanya tersedia jika pemohon mengizinkan namanya ditampilkan di situs ini)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "Tidak aktif" @@ -1879,15 +1895,15 @@ msgstr "Sertakan detail pribadi pelapor" msgid "Incorrect has_photo value \"%s\"" msgstr "Nilai has_photo keliru \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "Inspeksi laporan" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "Diperlukan inspeksi" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "Instruksikan kontraktor untuk mengatasi masalah" @@ -1895,7 +1911,7 @@ msgstr "Instruksikan kontraktor untuk mengatasi masalah" msgid "Internal notes" msgstr "Catatan internal" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "Kesalahan sistem pada internet" @@ -1903,12 +1919,12 @@ msgstr "Kesalahan sistem pada internet" msgid "Invalid agency_responsible value %s" msgstr "Nilai agency_responsible keliru %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Format %s yang disebutkan keliru." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "Lokasi keliru. Lokasi baru harus dicakup oleh dewan yang sama." @@ -1929,7 +1945,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1942,8 +1958,8 @@ msgstr "" msgid "Last 7 days" msgstr "7 hari terakhir" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Penyunting terakhir" @@ -1959,17 +1975,17 @@ msgstr "Pembaruan terakhir:" msgid "Last update:" msgstr "Pembaruan terakhir:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "Lintang/Bujur:" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "Terlama dari yang baru-baru ini diperbarui" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Biarkan ini tetap kosong jika semua laporan ke badan ini harus dikirim menggunakan metode pengiriman yang sama (mis., \"%s\")." @@ -1977,7 +1993,7 @@ msgstr "Biarkan ini tetap kosong jika semua laporan ke badan ini harus dikirim m msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Tampilkan semua masalah yang dilaporkan" @@ -2021,16 +2037,16 @@ msgstr "Masuk dengan Facebook" msgid "Log in with Twitter" msgstr "Masuk dengan Twitter" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Masuk dengan surel" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2038,23 +2054,23 @@ msgstr "" msgid "Look up" msgstr "Cari" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "PETA" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "Kelola daftar pendek" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "Permintaan manual" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Peta" @@ -2062,15 +2078,15 @@ msgstr "Peta" msgid "Mark as sent" msgstr "Tandai sebagai dikirim" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Tandai pengguna yang perilakunya ingin Anda pantau." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "Detail masalah penggelembungan" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Pesan" @@ -2086,19 +2102,19 @@ msgstr "Kirim pesan ke badan eksternal:" msgid "Missing bodies:" msgstr "Badan tidak ditemukan:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "jurisdiction_id tidak ditemukan" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Moderasi" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "Detail laporan moderasi" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Moderasi laporan ini" @@ -2106,10 +2122,10 @@ msgstr "Moderasi laporan ini" msgid "Moderate this update" msgstr "Moderasi pembaruan ini" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "Dimoderasi oleh %s pada %s" @@ -2127,12 +2143,12 @@ msgstr "" msgid "Month" msgstr "Bulan" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Komentar terbanyak" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2144,11 +2160,11 @@ msgstr "Komentar terbanyak" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2157,7 +2173,7 @@ msgstr "Nama" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Nama:" @@ -2167,11 +2183,11 @@ msgstr "Nama:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Beralih ke masalah ini" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2183,7 +2199,7 @@ msgstr "Jalan bernama terdekat dengan pin yang dipasang di peta (dibuat otomatis msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Kode pos terdekat dengan pin yang dipasang di peta (dibuat otomatis): %s (%s m jauhnya)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Jalan terdekat dengan pin yang dipasang di peta (dibuat otomatis dengan Bing Maps): %s" @@ -2209,11 +2225,11 @@ msgstr "Hampir selesai! Sekarang, periksa surel Anda…" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Badan baru ditambahkan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Kontak kategori baru ditambahkan" @@ -2249,23 +2265,23 @@ msgstr "" msgid "New priority" msgstr "Prioritas baru" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2273,7 +2289,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Masalah baru untuk {{COUNCIL}} di kelurahan {{WARD}} di FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2309,11 +2325,11 @@ msgstr "Wilayah baru" msgid "New template" msgstr "Template baru" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Terbaru" @@ -2325,10 +2341,10 @@ msgstr "Selanjutnya" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2336,11 +2352,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Tidak" @@ -2348,11 +2363,7 @@ msgstr "Tidak" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Tidak ada area" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Tidak ada badan" @@ -2360,7 +2371,7 @@ msgstr "Tidak ada badan" msgid "No council selected" msgstr "Tidak ada dewan dipilih" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Belum ada penyuntingan." @@ -2377,11 +2388,11 @@ msgstr "Tidak ditemukan pengguna ditandai." msgid "No further updates" msgstr "Tidak ada pembaruan lebih lanjut" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "Tidak dilakukan inspeksi oleh inspektor pada kisaran tanggal yang dipilih." -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "Tidak dilakukan inspeksi pada kisaran tanggal yang dipilih." @@ -2389,12 +2400,12 @@ msgstr "Tidak dilakukan inspeksi pada kisaran tanggal yang dipilih." msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Tidak ada hasil dikembalikan" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2413,8 +2424,8 @@ msgstr "Tidak ada pendukung" msgid "None" msgstr "Tidak Ada" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." @@ -2422,8 +2433,8 @@ msgstr "" "Pengguna normal (publik) tidak boleh dihubungkan dengan area mana pun.
\n" " Staf pengguna berwenang dapat dihubungkan dengan area yang dioperasikannya." -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2447,13 +2458,13 @@ msgstr "Tidak dilaporkan sebelumnya" msgid "Not reported to council" msgstr "Tidak dilaporkan ke dewan" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Catatan" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Catatan:" @@ -2477,15 +2488,15 @@ msgstr "Jumlah masalah yang dilaporkan di setiap kategori, selama 7 hari terakhi msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "Oke" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "Data offline dihapus" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "Data pembaruan offline disimpan" @@ -2493,16 +2504,16 @@ msgstr "Data pembaruan offline disimpan" msgid "Old state" msgstr "Wilayah lama" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Terlama" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2513,7 +2524,7 @@ msgstr "" msgid "Open" msgstr "Buka" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "Kunci API Open311" @@ -2521,7 +2532,7 @@ msgstr "Kunci API Open311" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 untuk server mySociety FixMyStreet" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "Yurisdiksi Open311" @@ -2553,17 +2564,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Lainnya" @@ -2588,8 +2599,8 @@ msgstr "Pemilik" msgid "Page Not Found" msgstr "Halaman Tidak Ditemukan" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Induk" @@ -2603,19 +2614,19 @@ msgstr "Parsial" msgid "Password (optional)" msgstr "Kata sandi (opsional)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Permalink:" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Perizinan:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2635,17 +2646,16 @@ msgstr "Nomor telepon (opsional)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telepon:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2656,6 +2666,7 @@ msgstr "Telepon:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2670,7 +2681,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "Foto diperlukan." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Foto diperlukan" @@ -2699,11 +2710,15 @@ msgstr "Pilih dewan Anda" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Pasang pin di peta" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Mohon untuk sopan, singkat, dan langsung ke intinya." @@ -2720,7 +2735,7 @@ msgstr "Silakan periksa kata sandi dan coba lagi" msgid "Please check your email address is correct" msgstr "Silakan periksa apakah alamat surel Anda benar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2728,11 +2743,11 @@ msgstr "Silakan periksa apakah alamat surel Anda benar" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Silakan pilih kategori" @@ -2741,8 +2756,9 @@ msgstr "Silakan pilih kategori" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Mohon koreksi kesalahan-kesalahan di bawah ini" @@ -2761,13 +2777,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Mohon untuk tidak menggunakan bahasa yang kasar — menggunakan bahasa yang kasar terhadap dewan Anda akan menurunkan mutu layanan bagi semua pengguna." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Silakan masukkan pesan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2775,90 +2791,90 @@ msgstr "Silakan masukkan pesan" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Silakan masukkan nama baru" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "Silakan masukkan nama untuk badan ini" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Silakan masukkan kata sandi" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Silakan masukkan subjek" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Silakan masukkan surel yang valid" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Silakan masukkan alamat surel yang valid" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Silakan masukkan detail" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Silakan masukkan surel Anda" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Silakan masukkan nama depan Anda" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Silakan masukkan nama lengkap Anda, dewan membutuhkan informasi ini – jika Anda tidak ingin nama Anda ditampilkan di situs, hapus centang pada kotak di bawah" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Silakan masukkan nama Anda" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Silakan masukkan nomor telepon Anda" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Silakan masukkan nama kedua Anda" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Silakan masukkan sapaan Anda" @@ -2886,7 +2902,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Mohon beri tahukan apakah Anda ingin menerima kuesioner lainnya" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2912,11 +2928,11 @@ msgstr "Harap perhatikan bahwa pembaruan Anda belum terkirim." msgid "Please note:" msgstr "Harap perhatikan:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "Mohon berikan pembaruan publik untuk laporan ini." @@ -2952,16 +2968,16 @@ msgstr "Mohon beri tahu apakah masalah telah diatasi atau belum" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "Mohon untuk hanya mengunggah gambar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Silakan tuliskan pesan" @@ -2997,12 +3013,12 @@ msgstr "Didukung oleh reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "Laporan akan otomatis dikirim tanpa memerlukan inspeksi jika reputasi pengguna setara dengan atau lebih dari nilai ini. Atur ke 0 jika semua laporan harus diinspeksi tanpa terkecuali." -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "Batas reputasi" @@ -3504,20 +3534,20 @@ msgstr "Template Tanggapan" msgid "Response Templates for %s" msgstr "Template Tanggapan untuk %s" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "Kembalikan ke awal" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "Kembalikan ke teks awal" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "Kembalikan ke judul awal" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Tempat yang benar?" @@ -3529,15 +3559,15 @@ msgstr "Operator jalan untuk jalan bernama ini (diambil dari tipe dan nomor refe msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operator jalan untuk jalan bernama ini (dari OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Putar Kiri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3548,23 +3578,23 @@ msgstr "Putar Kanan" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Memutar foto ini akan membuang perubahan yang belum disimpan pada laporan." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelit" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "Simpan + tutup sebagai duplikat" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Simpan perubahan" @@ -3573,12 +3603,12 @@ msgstr "Simpan perubahan" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "Simpan dengan pembaruan publik" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "Bagikan laporan offline" @@ -3588,7 +3618,8 @@ msgstr "Bagikan laporan offline" msgid "Search Reports" msgstr "Cari Laporan" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Cari Pengguna" @@ -3597,7 +3628,7 @@ msgid "Search reports" msgstr "Cari laporan" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Cari:" @@ -3607,7 +3638,7 @@ msgstr "Cari:" msgid "Searching found no reports." msgstr "Tidak ditemukan laporan." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Tidak ditemukan pengguna." @@ -3623,17 +3654,18 @@ msgstr "" msgid "See our privacy policy" msgstr "Lihat kebijakan privasi kami." -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "Lihat detail pengguna untuk laporan yang dibuat sebagai dewan" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Pilih badan" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Pilih area" @@ -3653,15 +3685,15 @@ msgstr "" msgid "Select:" msgstr "Pilih:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "Kirim" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "Kirim status Open311 yang ditambahkan dengan pembaruan permintaan layanan" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3670,7 +3702,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "Laporan dikirim kembali" @@ -3697,7 +3729,7 @@ msgstr "Layanan:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "Atur ke lokasi saya saat ini" @@ -3706,9 +3738,9 @@ msgid "Share" msgstr "Bagikan" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "Daftar Pendek" @@ -3716,15 +3748,15 @@ msgstr "Daftar Pendek" msgid "Shortlist all visible" msgstr "Tampilkan semua dalam daftar pendek" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Dimasukkan ke daftar pendek" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "Dimasukkan ke daftar pendek oleh %s" @@ -3736,7 +3768,7 @@ msgstr "Tampilkan Foto?" msgid "Show all updates" msgstr "Tampilkan semua pembaruan" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Tampilkan nama saya ke publik" @@ -3748,21 +3780,21 @@ msgstr "Tampilkan nama ke publik?" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "Tampilkan foto" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Tampilkan pin" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "Tampilkan nama pelapor" @@ -3805,8 +3837,8 @@ msgstr "Keluar" msgid "Some categories may require additional information." msgstr "Beberapa kategori mungkin membutuhkan informasi tambahan." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3823,6 +3855,14 @@ msgstr "Beberapa foto dari laporan terbaru" msgid "Some text to localize" msgstr "Sejumlah teks untuk dilokalisasikan" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Maaf, tampaknya ini adalah kode pos Dependensi Kerajaan, yang tidak dicakup oleh layanan kami." @@ -3840,7 +3880,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Maaf, terjadi kesalahan saat mengonfirmasikan masalah Anda." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3862,7 +3902,7 @@ msgstr "Maaf, kami tidak dapat mengurai lokasi tersebut. Silakan coba lagi." msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Maaf, kami tidak dapat menyimpan gambar Anda, silakan coba lagi." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3874,15 +3914,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "Maaf, Anda tidak memiliki izin untuk melakukannya." -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Sortir berdasarkan" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "Staf pengguna memiliki izin untuk masuk sebagai admin." -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "Staf:" @@ -3890,31 +3930,32 @@ msgstr "Staf:" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Wilayah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3927,14 +3968,14 @@ msgstr "" msgid "State:" msgstr "Wilayah:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3950,7 +3991,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3963,7 +4004,7 @@ msgstr "Tampilan Jalan" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3971,12 +4012,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Subdivisi/Badan" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Subjek" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Subjek:" @@ -3994,7 +4035,7 @@ msgstr "Masukkan" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -4015,7 +4056,8 @@ msgstr "Dimasukkan" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Berlangganan" @@ -4023,21 +4065,29 @@ msgstr "Berlangganan" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "Buat ringkasan masalah" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "Buat ringkasan tentang perubahan Anda" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4057,11 +4107,11 @@ msgstr "Laporan ringkasan" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "Pengguna Super:" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "Pengguna Super memiliki izin untuk melakukan semua tindakan sebagai admin." @@ -4079,8 +4129,8 @@ msgstr "" msgid "Template «%s»" msgstr "Template «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4090,7 +4140,7 @@ msgstr "Template" msgid "Text" msgstr "Teks" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Versi teks saja" @@ -4134,7 +4184,7 @@ msgstr "Terima kasih, kami senang mendengar masalahnya telah diatasi! Dapatkah k msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Gambar tersebut tampaknya tidak terunggah dengan benar (%s), silakan coba lagi." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Lokasi tersebut tampaknya tidak dicakup oleh dewan; mungkin lokasinya terletak di lepas pantai atau di luar negeri. Silakan coba lagi." @@ -4148,11 +4198,11 @@ msgstr "Lokasi tersebut tampaknya bukan di UK; silakan coba lagi." msgid "That postcode was not recognised, sorry." msgstr "Maaf, kode pos tersebut tidak dikenali." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Masalah tersebut telah ditandai sebagai terkirim." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Masalah tersebut sekarang akan dikirim ulang." @@ -4164,23 +4214,23 @@ msgstr "Laporan tersebut tidak dapat ditampilkan di %s." msgid "That report has been removed from FixMyStreet." msgstr "Laporan tersebut telah dihapus dari FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4188,8 +4238,8 @@ msgstr "" "Alamat surel adalah tujuan pengiriman laporan dalam kategori ini. \n" " Kategori lain untuk badan ini mungkin memiliki alamat surel yang sama." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4197,15 +4247,15 @@ msgstr "" "Titik akhir adalah URL layanan yang akan terhubung dengan FixMyStreet \n" " saat mengirimkan laporan ke badan in." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." @@ -4213,10 +4263,10 @@ msgstr "" "Yurisdiksi hanya dibutuhkan jika titik akhir melayani lebih\n" " dari satu. Jika badan memiliki titik akhirnya sendiri, biasanya Anda dapat membiarkan ini tetap kosong." -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4228,8 +4278,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Atribut agency_responsible pada Open311 v2 digunakan untuk mendata administrasi yang menerima laporan masalah, yang cukup berbeda dengan penjelasan atribut dalam spesifikasi Open311 v2." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4246,12 +4296,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Dewan tidak akan dapat membantu kecuali Anda menyediakan sebanyak mungkin detail. Mohon jelaskan lokasi tepat dari masalah (misal, di dinding), apa masalah tersebut, berapa lama masalah telah berlangsung, berikan keterangan (dan foto masalah jika Anda memilikinya), dan lain-lain." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Tabel liga kerajinan menampilkan aktivitas penyunting (siapa yang paling banyak menyunting data)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Kesalahannya adalah: %s" @@ -4297,7 +4347,7 @@ msgstr "Masalah terbaru dalam cakupan {{NAME}} yang dilaporkan oleh pengguna" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Tautan ini mungkin telah kedaluwarsa, atau Anda mungkin tidak menyalin dan merekatkannya dengan benar." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Daftar area yang tersedia sedang disiapkan oleh layanan MapIt pada %s." @@ -4318,20 +4368,20 @@ msgstr "URL yang diminta '%s' tidak ditemukan di server ini" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Pengguna tidak dapat melacak masalah pada peta, tetapi untuk melihat area di sekitar lokasi yang mereka masukkan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4345,7 +4395,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Tidak ada laporan untuk ditampilkan." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4353,8 +4407,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Terdapat masalah saat menampilkan halaman Semua Laporan. Silakan coba lagi nanti." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Terdapat masalah saat menampilkan halaman ini. Silakan coba lagi nanti." @@ -4376,7 +4430,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Terdapat masalah dengan pembaruan Anda. Silakan coba lagi." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Terdapat masalah dengan laporan Anda. Silakan lihat di bawah ini." @@ -4393,8 +4447,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4408,7 +4462,7 @@ msgstr "" " artikel ini.\n" " " -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4426,7 +4480,7 @@ msgstr "Ini akan dikirimkan kepada %s dan juga diterbitkan seca msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Implementasi API sedang dalam pengerjaan dan belum stabil. Ini akan berubah tanpa pemberitahuan sebelumnya di masa mendatang." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4436,12 +4490,12 @@ msgstr "" " Oleh karenanya, tidak satu pun kategorinya akan ditampilkan pada menu dropdown kategori saat pengguna melaporkan masalah.\n" " Saat ini, pengguna tidak dapat melaporkan masalah kepada badan ini." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Badan ini tidak memiliki kontak. Ini berarti bahwa saat ini masalah yang dilaporkan ke badan ini tidak akan dikirimkan." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4449,18 +4503,17 @@ msgstr "" "Badan ini hanya akan dikirimi laporan tentang masalah yang berlokasi di area cakupannya.\n" " Sebuah badan tidak akan menerima laporan kecuali badan mencakup paling tidak satu area." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Surel ini telah dikirimkan kepada kedua dewan yang mencakup lokasi masalah, karena pengguna tidak memilih kategorinya; silakan abaikan jika Anda bukan dewan yang tepat untuk menangani masalah ini, atau beri tahu kami termasuk ke dalam kategori apakah masalah ini agar kami dapat menambahkannya ke sistem kami." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Surel ini telah dikirimkan kepada beberapa dewan yang mencakup lokasi masalah, karena kategori yang dipilih tersedia untuk semua dewan ini; silakan abaikan jika Anda bukan dewan yang tepat untuk menangani masalah ini." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Informasi ini diperlukan" @@ -4477,7 +4530,11 @@ msgstr "Ini adalah situs pengembang; kesalahan mungkin terjadi kapan saja, dan b msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4493,12 +4550,16 @@ msgstr "Masalah ini belum diatasi" msgid "This problem is still ongoing" msgstr "Masalah ini masih berlangsung" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "Laporan ini adalah duplikat. Silakan tambahkan pembaruan pada laporan asli:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Laporan ini menunggu moderasi." @@ -4519,7 +4580,7 @@ msgstr "Laporan ini saat ini ditandai sebagai terbuka." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Halaman web ini juga berisi foto masalah yang disediakan oleh pengguna." @@ -4530,7 +4591,7 @@ msgstr "Halaman web ini juga berisi foto masalah yang disediakan oleh pengguna." msgid "Time spent (in minutes):" msgstr "Waktu yang dihabiskan (dalam menit):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Kronologi" @@ -4568,7 +4629,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Untuk melihat peta dari lokasi tepat dari masalah ini" @@ -4597,34 +4658,34 @@ msgstr "" msgid "Total" msgstr "Total" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "Perlu manajemen lalu lintas?" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "Dipercaya oleh badan:" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "Dipercaya membuat laporan yang tidak perlu diinspeksi" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "Dipercaya:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Coba lagi" @@ -4643,16 +4704,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4670,7 +4731,7 @@ msgstr "Tipe peringatan tidak diketahui" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Kesalahan tidak diketahui" @@ -4683,7 +4744,7 @@ msgstr "Kesalahan tidak diketahui" msgid "Unknown problem ID" msgstr "ID masalah tidak diketahui" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4696,7 +4757,7 @@ msgid "Up one" msgstr "Naik satu tingkat" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Pembaruan" @@ -4705,16 +4766,16 @@ msgstr "Pembaruan" msgid "Update %s created for problem %d; by %s" msgstr "Pembaruan %s dibuat untuk masalah %d; oleh %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Pembaruan di bawah ini ditambahkan secara anonim pada %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Pembaruan di bawah ini ditambahkan oleh %s pada %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Perbarui badan" @@ -4739,7 +4800,7 @@ msgstr "Pembaruan menandai masalah sebagai diatasi" msgid "Update reopened problem" msgstr "Pembaruan membuka kembali masalah" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Perbarui status" @@ -4757,14 +4818,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Diperbarui!" @@ -4789,12 +4850,12 @@ msgstr "Pembaruan pada {{title}}" msgid "Updates to this problem, %s" msgstr "Pembaruan pada masalah ini, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4810,15 +4871,15 @@ msgstr "" "filter peta, dan dihapus juga akan menghapus kategori\n" "dari menu." -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "Gunakan ekstensi pengiriman pembaruan Open311" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "Gunakan kolom ini untuk menyimpan detail yang hanya ditampilkan pada admin. Inputan tidak ditampilkan ke publik, dan tidak dikirimkan ke badan." @@ -4827,48 +4888,48 @@ msgstr "Gunakan kolom ini untuk menyimpan detail yang hanya ditampilkan pada adm msgid "Used map" msgstr "Peta digunakan" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "ID Pengguna untuk dikaitkan dengan komentar yang diambil" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Tanda pada pengguna dihapus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Pengguna ditandai" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Pencarian pengguna menemukan kecocokan pada nama pengguna dan alamat surel." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4877,20 +4938,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Pengguna" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "Pengguna dapat melakukan tindakan berikut ini dalam badan atau area yang ditetapkan untuknya." -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Nilai diperbarui" @@ -4924,12 +4985,12 @@ msgstr "Tampilkan laporan berdasarkan kelurahan" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Menampilkan lokasi" @@ -4964,7 +5025,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "Kami memerlukan alamat surel Anda, silakan masukkan di bawah." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Kami menyadari bahwa masalah ini mungkin merupakan tanggung jawab%s; meski begitu, saat ini kami tidak memiliki detail kontaknya. Jika Anda mengetahui alamat kontak yang tepat, silakan hubungi kami." @@ -4979,8 +5040,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Kami hanya akan menggunakan informasi pribadi Anda sesuai dengan kebijakan privasi kami." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4994,8 +5055,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "Kami akan menghubungi Anda kembali sesegera mungkin." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Saat disunting" @@ -5015,14 +5080,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "Duplikat dari laporan yang manakah ini?" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "Wah, kawan! Tiga foto sudah cukup." - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "Mengapa berhenti di sana? Atur lebih banyak peringatan dengan gratis." @@ -5043,15 +5104,19 @@ msgstr "Inginkah Anda berkontribusi di FixMyStreet? Kode kami adalah sumber terb msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Inginkah Anda menerima kuesioner lain dalam 4 minggu, mengingatkan Anda untuk memeriksa statusnya?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Menuliskan pesan Anda seluruhnya dalam huruf kapital membuatnya sulit dibaca, begitu juga dengan kurangnya tanda baca." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5060,20 +5125,19 @@ msgstr "Menuliskan pesan Anda seluruhnya dalam huruf kapital membuatnya sulit di #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ya" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Anda mengeluhkan bahwa laporan masalah ini dimoderasi meskipun tidak perlu:" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "Anda sedang offline" @@ -5081,7 +5145,7 @@ msgstr "Anda sedang offline" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Anda melaporkan laporan masalah berikut ini karena menggunakan kata-kata kasar, berisi informasi pribadi, atau yang serupa:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Anda melaporkan pembaruan berikut ini karena menggunakan kata-kata kasar, berisi informasi pribadi, atau yang serupa;" @@ -5094,7 +5158,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Anda dapat menampilkan masalah di situs ini." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Anda dapat menambahkan surel pengguna yang melanggar aturan ke daftar penyalahgunaan, yang akan otomatis menyembunyikan (dan tidak pernah mengirimkan) laporan yang dibuatnya." @@ -5102,7 +5166,7 @@ msgstr "Anda dapat menambahkan surel pengguna yang melanggar aturan ke daftar pe msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Anda dapat menghubungi dukungan teknis di %s" @@ -5123,15 +5187,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Anda dapat membantu kami dengan menemukan alamat surel kontak untuk masalah lokal untuk %s dan mengirimkannya kepada kami melalui surel di %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Anda dapat menandai sebuah badan sebagai dihapus jika Anda tidak ingin badan ini aktif di situs." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Anda menolak; mohon isi kotak di atas" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "Anda punya %s yang disimpan untuk dikirim." @@ -5197,7 +5261,7 @@ msgstr "Anda belum memasukkan laporan mana pun ke daftar pendek." msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Anda perlu menambahkan beberapa badan (seperti dewan atau departemen) sebelum laporan mana pun dapat dikirimkan." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5221,9 +5285,10 @@ msgstr "Akun Anda" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Surel Anda" @@ -5239,10 +5304,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Informasi Anda hanya akan digunakan sesuai dengan kebijakan privasi kami" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Nama Anda" @@ -5258,7 +5323,7 @@ msgstr "Nama Anda telah disembunyikan pada semua laporan dan pembaruan Anda." msgid "Your name has been hidden." msgstr "Nama Anda telah disembunyikan" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "Laporan offline Anda" @@ -5281,7 +5346,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Nomor telepon Anda" @@ -5306,7 +5371,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "Pembaruan Anda telah disimpan secara offline untuk dikirim saat Anda kembali online." @@ -5323,25 +5388,24 @@ msgstr "" msgid "Yourself" msgstr "Anda" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "semua" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5375,8 +5439,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "sunting pengguna" @@ -5385,12 +5449,12 @@ msgstr "sunting pengguna" msgid "from %s different users" msgstr "dari %s pengguna berbeda" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "terakhir diperbarui %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "kurang dari satu menit" @@ -5401,7 +5465,7 @@ msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "tidak ada" @@ -5441,7 +5505,7 @@ msgstr "awalnya dimasukkan: “%s”" msgid "other areas:" msgstr "area lainnya:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5449,7 +5513,7 @@ msgstr "" msgid "sign out" msgstr "keluar" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5466,19 +5530,19 @@ msgstr "tidak ada pin ditampilkan karena pengguna tidak menggunakan peta" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "tipe masalah lokal ini" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "hari ini" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "pembaruan" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "pembaruan" @@ -5494,11 +5558,11 @@ msgstr "pengguna dari dewan yang sama dengan masalah - %d" msgid "user is problem owner" msgstr "pengguna adalah pemilik masalah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5507,31 +5571,31 @@ msgstr "" msgid "ward" msgstr "kelurahan" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "%d alamat" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d hari" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d jam" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d menit" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5543,13 +5607,13 @@ msgid "%d supporter" msgid_plural "%d supporters" msgstr[0] "%d pendukung" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d minggu" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5609,7 +5673,7 @@ msgid "%s update on reports" msgid_plural "%s updates on reports" msgstr[0] "%s pembaruan atas laporan" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5627,7 +5691,7 @@ msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." msgstr[0] "Kami belum memiliki detail mengenai dewan yang mencakup lokasi ini," -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po index 7b4dfc53545..45b10752c3c 100644 --- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,16 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 -# Sebastiano Pistore , 2019 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: Sebastiano Pistore , 2019\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Italian (https://www.transifex.com/mysociety/teams/12067/it/)\n" "Language: it\n" "MIME-Version: 1.0\n" @@ -23,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "e" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -37,11 +36,11 @@ msgstr "e" msgid " or " msgstr "o" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "%d caratteri al massimo" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d modificato da %s" @@ -49,7 +48,7 @@ msgstr "%d modificato da %s" msgid "%d to %d of %d" msgstr "%d a %d di %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -155,7 +154,7 @@ msgstr "(come gli atti vandalici, le discariche abusive, la pavimentazione e l'i msgid "(no longer exists)" msgstr "(non esiste più)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(non inviato al Comune)" @@ -164,11 +163,11 @@ msgstr "(non inviato al Comune)" msgid "(optional)" msgstr "(opzionale)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(inviato ad entrambi)" @@ -177,13 +176,13 @@ msgstr "(inviato ad entrambi)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Scegli una categoria --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "-- Scegli un'opzione --" @@ -191,8 +190,8 @@ msgstr "-- Scegli un'opzione --" msgid "--Choose a template--" msgstr "--Scegli un template--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -204,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%s salvati." @@ -233,11 +232,11 @@ msgstr "No Lasciami confermare il mio aggiornamento via email" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -257,21 +256,21 @@ msgstr "Attiva l'autenticazione a due fattori" msgid "Add" msgstr "Aggiungi" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Aggiungi un corpo" @@ -292,8 +291,8 @@ msgstr "Aggiungi campo" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Aggiungi una nuova categoria" @@ -308,27 +307,27 @@ msgstr "Aggiungi numero telefonico" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Aggiungi un'utente" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Aggiungi/modifica categorie di problemi" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Aggiungi/modifica priorità risposta" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -336,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "Aggiunti %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -365,7 +364,6 @@ msgstr "Avvisami su futuri aggiornamenti" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -412,11 +410,15 @@ msgstr "Tutte le segnalazioni tra %s e %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -435,9 +437,9 @@ msgid "Anonymous user" msgstr "Utente anonimo" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonimo:" @@ -446,29 +448,29 @@ msgstr "Anonimo:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Sei sicuro?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Area coperta" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -489,11 +491,11 @@ msgstr "Assegna ad un corpo esterno:" msgid "Assign to subdivision:" msgstr "Assegna ad una subdivisione:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Assegnato a %s" @@ -505,8 +507,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "Al momento funziona solo la ricerca e la visualizzazione delle segnalazioni." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -522,7 +524,7 @@ msgstr "Risposta automatica:" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -543,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "In attesa di moderazione" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Indietro" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -555,10 +557,10 @@ msgstr "" msgid "Ban user" msgstr "Segnala utente" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -567,17 +569,17 @@ msgstr "Corpi" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Corpo" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Corpo:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "File CSV" @@ -593,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Non riesci a vedere la mappa? Salta questo passaggio" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -604,15 +606,15 @@ msgstr "Categorie" msgid "Categories:" msgstr "Categorie:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -625,7 +627,7 @@ msgstr "Categoria" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -635,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -664,11 +666,11 @@ msgstr "Cambia la password" msgid "Change phone number" msgstr "Cambia il numero telefonico" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -679,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "Cancella dati offline" @@ -721,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -767,17 +773,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "Codice" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configurazione" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Conferma" @@ -798,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "Conferma" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Confermato" @@ -830,7 +836,11 @@ msgstr "Contatta il team" msgid "Continue" msgstr "Continua" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -839,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "Coordinate:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Non posso trovare l'utente" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Non posso trovare l'area desiderata" @@ -852,9 +862,11 @@ msgstr "Non posso trovare l'area desiderata" msgid "Council" msgstr "Comune" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "I contatti del comune per %s" @@ -883,8 +895,8 @@ msgstr "Crea una segnalazione" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Crea una categoria" @@ -892,15 +904,15 @@ msgstr "Crea una categoria" msgid "Create priority" msgstr "Crea una priorità" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -914,7 +926,7 @@ msgstr "Crea template" msgid "Created" msgstr "Creato" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -937,12 +949,12 @@ msgstr "Token attuale:" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -970,32 +982,32 @@ msgstr "Default" msgid "Default priority" msgstr "Priorità predefinita" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "Elimina" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Eliminato" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1011,18 +1023,18 @@ msgstr "Descrizione" msgid "Description:" msgstr "Descrizione:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "Le informazioni dettagliate sono limitate a %d caratteri." -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Dettagli" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1033,7 +1045,7 @@ msgstr "Dettagli:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Devoluto:" @@ -1042,24 +1054,24 @@ msgstr "Devoluto:" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "Non salvare modifiche" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1068,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "Possiedi una password per accedere a %s?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1076,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "Non lo so" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1084,19 +1096,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "Duplicato di" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "Duplicati" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1104,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1113,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Modifica" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Modifica dettagli corpo" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1137,15 +1149,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Modifica segnalazioni" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1168,28 +1180,28 @@ msgstr "Modifica problema %d" msgid "Editing update %d" msgstr "Modifica aggiornamento %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Modifica utente %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Editor" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1218,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "Email verificata:" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Email:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "Attiva" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1256,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1265,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1282,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "Data di fine" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Punto finale" @@ -1304,10 +1316,6 @@ msgstr "Inserisci il piu vicino codice postale UK o il nome di una strada e l'ar msgid "Enter a nearby street name and area" msgstr "Inserisci il nome di una strada nelle vicinanze e una città o solo in nome della città " -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Inserisci i dettagli del problema" @@ -1321,13 +1329,13 @@ msgstr "Inserisci i dettagli del problema" msgid "Error" msgstr "Errore" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Esempio codice postale %s" @@ -1339,11 +1347,11 @@ msgstr "Esempi:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "Ingrandisci mappa" @@ -1360,7 +1368,7 @@ msgstr "Esporta come CSV" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "URL esterno" @@ -1381,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "Campi extra" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Dati extra:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1422,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Prima volta" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1446,9 +1455,9 @@ msgstr "Risolto - Comune" msgid "Fixed - User" msgstr "Risolto - Utente" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Segna come cancellato" @@ -1456,8 +1465,8 @@ msgstr "Segna come cancellato" msgid "Flag user" msgstr "Utente segnalato" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Segnalato" @@ -1465,7 +1474,7 @@ msgstr "Segnalato" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1474,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Segnalato:" @@ -1490,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1504,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Hai dimenticato la tua password?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1524,6 +1533,8 @@ msgstr "Genera token" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Ottieni aggiornamenti " @@ -1554,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1566,7 +1577,7 @@ msgstr "Vai" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1574,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1625,11 +1636,11 @@ msgstr "Nascosto" msgid "Hidden Field" msgstr "Campo non visibile" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "Rendi non visibile tutta segnalazione" @@ -1650,9 +1661,9 @@ msgstr "Rendi non visibile il mio nome nella segnalazione" msgid "Hide my name on this report" msgstr "Nascondi il mio nome in questa segnalazione" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "" @@ -1669,11 +1680,11 @@ msgstr "Vuoi nascondere il tuo nome?" msgid "Hint" msgstr "Consiglio" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Cronologia" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Home" @@ -1681,7 +1692,7 @@ msgstr "Home" msgid "How to report a problem" msgstr "Come segnalare un problema" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Come inviare segnalazioni di successo" @@ -1703,7 +1714,7 @@ msgstr "Mi spiace non possiamo localizzare il tuo problema nel database.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1712,8 +1723,8 @@ msgstr "Mi spiace non possiamo localizzare il tuo problema nel database.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1735,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1753,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1780,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID illegale" @@ -1815,7 +1830,7 @@ msgstr "ID illegale" msgid "Illegal feed selection" msgstr "Selezione feed illegale" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1827,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "Non attivo" @@ -1843,15 +1858,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "Richiesta ispezione" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1859,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "Note interne" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1867,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1893,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "Etichetta" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "Lingua" @@ -1906,8 +1921,8 @@ msgstr "Lingue" msgid "Last 7 days" msgstr "Ultimi 7 giorni" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Ultima modifica" @@ -1923,17 +1938,17 @@ msgstr "Ultimo aggiornamento:" msgid "Last update:" msgstr "Ultimo aggiornamento:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "Latitudine/Longitudine:" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1941,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Lista di tutti i problemi segnalati" @@ -1985,16 +2000,16 @@ msgstr "Login via Facebook" msgid "Log in with Twitter" msgstr "Login via Twitter" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Login tramite email" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "Login tramite email/testo" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "Logout di tutte le sessioni" @@ -2002,23 +2017,23 @@ msgstr "Logout di tutte le sessioni" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "MAPPA" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "Ordinamento manuale" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Mappa" @@ -2026,15 +2041,15 @@ msgstr "Mappa" msgid "Mark as sent" msgstr "Segna come inviato" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Messaggio" @@ -2050,19 +2065,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2070,10 +2085,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2091,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "Mese" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2108,11 +2123,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2121,7 +2136,7 @@ msgstr "Nome" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Nome:" @@ -2131,11 +2146,11 @@ msgstr "Nome:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2147,7 +2162,7 @@ msgstr "Il più vicino nome della strada al segno posizionato sulla mappa (autom msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2171,11 +2186,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Nuovo corpo aggiunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Nuova categoria contatto aggiunta" @@ -2211,23 +2226,23 @@ msgstr "Nuovo numero telefonico:" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2235,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Nuovi problemi per {{COUNCIL}} dentro il quartiere {{WARD}} su FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2271,11 +2286,11 @@ msgstr "Nuovo stato" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Più recenti" @@ -2287,10 +2302,10 @@ msgstr "Prossimo" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2298,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "No" @@ -2310,11 +2324,7 @@ msgstr "No" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Nessun'area" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Nessun corpo" @@ -2322,7 +2332,7 @@ msgstr "Nessun corpo" msgid "No council selected" msgstr "Nessun comune selezionato" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Nessuna modifica è stata fatta fino ad ora." @@ -2339,11 +2349,11 @@ msgstr "" msgid "No further updates" msgstr "Nessun ulteriore aggiornamento" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2351,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Nessun risultato ritornato" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2373,15 +2383,15 @@ msgstr "Nessun sostenitore" msgid "None" msgstr "Nessuno" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2401,13 +2411,13 @@ msgstr "Non segnalato precedente" msgid "Not reported to council" msgstr "Non segnalato al comune" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Nota" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Nota:" @@ -2431,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2447,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "Vecchio stato" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Più vecchi" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2467,7 +2477,7 @@ msgstr "" msgid "Open" msgstr "Aperto" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2475,7 +2485,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2507,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Altro" @@ -2542,8 +2552,8 @@ msgstr "Proprietario" msgid "Page Not Found" msgstr "Pagina non trovata" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Parente" @@ -2557,19 +2567,19 @@ msgstr "Parziale" msgid "Password (optional)" msgstr "Password (opzionale)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2589,17 +2599,16 @@ msgstr "Numero di telefono (opzionale)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "Telefono verificato:" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefono:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2610,6 +2619,7 @@ msgstr "Telefono:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2624,7 +2634,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "Fotografia richiesta." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Fotografia richiesta" @@ -2653,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Inserisci il cursore sulla mappa" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Per favore cerca di essere educato, conciso e dritto al punto." @@ -2674,7 +2688,7 @@ msgstr "Per favore controlla la password e prova ancora" msgid "Please check your email address is correct" msgstr "Per favore controlla che il tuo indirizzo email è corretto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2682,11 +2696,11 @@ msgstr "Per favore controlla che il tuo indirizzo email è corretto" msgid "Please check your phone number is correct" msgstr "Assicurati che il tuo numero di telefono sia esatto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Per favore scegli una categoria" @@ -2695,8 +2709,9 @@ msgstr "Per favore scegli una categoria" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2712,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Per favore non abusarne — abusandone il comune svaluterà il servizio per tutti gli utenti." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Per favore inserisci un messaggio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2726,90 +2741,90 @@ msgstr "Per favore inserisci un messaggio" msgid "Please enter a mobile number" msgstr "Inserisci un numero di cellulare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Inserire un nome" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Per favore inserisci la password" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Per favore inserisci il soggetto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Per favore inserire un email valida" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Per favore inserire un indirizzo email valido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "Inserire un numero di telefono oppure un'email valida" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Per favore inserire qualche dettaglio " -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Per favore inserisci la tua email" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Per favore inserisci il tuo nome" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Per favore inserisci il tuo nome completo, i comuni hanno bisogno di questa informazione - Se non vuoi che il tuo nome venga mostrato sul sito, deseleziona il box qui sotto" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Per favore inserisci il tuo nome" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Per favore inserisci il tuo numero di telefono" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Per favore inserisci il tuo cognome" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Per favore inserisci il tuo titolo" @@ -2837,7 +2852,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Per favore indicare se si vuole ricevere un altro questionario" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2863,11 +2878,11 @@ msgstr "" msgid "Please note:" msgstr "Attenzione:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2903,16 +2918,16 @@ msgstr "Si prega di indicare se il problema è stato risolto" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "Invia un'unica fotografia" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Per favore scrivi un messaggio" @@ -2948,12 +2963,12 @@ msgstr "Basato sulla piattaforma reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3455,20 +3484,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "Torna all'originale" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "E' il posto giusto?" @@ -3480,15 +3509,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Ruota a sinistra" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3499,23 +3528,23 @@ msgstr "Ruota a destra" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Salva modifiche" @@ -3524,12 +3553,12 @@ msgstr "Salva modifiche" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3539,7 +3568,8 @@ msgstr "" msgid "Search Reports" msgstr "Ricerca Segnalazioni" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Ricerca Utenti" @@ -3548,7 +3578,7 @@ msgid "Search reports" msgstr "Ricerca segnalazioni" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Cerca:" @@ -3558,7 +3588,7 @@ msgstr "Cerca:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3574,17 +3604,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Seleziona un'area" @@ -3604,15 +3635,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3621,7 +3652,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3648,7 +3679,7 @@ msgstr "" msgid "Set password" msgstr "Imposta password" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3657,9 +3688,9 @@ msgid "Share" msgstr "Condividi" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3667,15 +3698,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3687,7 +3718,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Mostra il mio nome pubblicamente" @@ -3699,21 +3730,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3756,8 +3787,8 @@ msgstr "Logout" msgid "Some categories may require additional information." msgstr "Qualche categoria potrebbe richiedere ulteriori informazioni." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3772,6 +3803,14 @@ msgstr "Qualche foto di segnalazioni recenti" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3789,7 +3828,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3811,7 +3850,7 @@ msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancor msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3821,15 +3860,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3837,31 +3876,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Stato" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3874,14 +3914,14 @@ msgstr "" msgid "State:" msgstr "Stato:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3897,7 +3937,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3910,7 +3950,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "Sottocategoria" @@ -3918,12 +3958,12 @@ msgstr "Sottocategoria" msgid "Subdivision/Body" msgstr "Sottodivisione/Corpo" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Soggetto" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Soggetto:" @@ -3941,7 +3981,7 @@ msgstr "Invia" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3962,7 +4002,8 @@ msgstr "Inviato" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Sottoscrivi" @@ -3970,21 +4011,29 @@ msgstr "Sottoscrivi" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4004,11 +4053,11 @@ msgstr "" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4026,8 +4075,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4037,7 +4086,7 @@ msgstr "" msgid "Text" msgstr "Testo" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Solo versione testuale" @@ -4081,7 +4130,7 @@ msgstr "Grazie, è fantastico sapere che è stato risolto! Possiamo soltanto chi msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Questa posizione non sembra essere coperta da un comune; forse è in mare aperto o all'esterno del paese. Riprova." @@ -4095,11 +4144,11 @@ msgstr "Questa posizione non sembra essere nel Regno Unito, si prega di riprovar msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "" @@ -4111,53 +4160,53 @@ msgstr "La segnalazione non può essere vista su %s." msgid "That report has been removed from FixMyStreet." msgstr "Quella segnalazione è stata rimossa da FixMyStreet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4167,8 +4216,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4183,12 +4232,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Il comune non sarà in grado di fare qualcosa finchè non lascerai più dettagli possibili sul problema che stai segnalando. Per favore descrivi l'esatta location (es. nel muro), che cos'è, da quanto tempo c'è, una descrizione (e una foto del problema se ne hai una), ecc.." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "L'errore era: %s" @@ -4234,7 +4283,7 @@ msgstr "Gli ultimi problemi dentro i confini di {{NAME}} segnalati dagli utenti" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4255,20 +4304,20 @@ msgstr "L'URL richiesta '%s' non è stata trovata su questo serverjavascript:;" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4280,7 +4329,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4288,8 +4341,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova ancora più tardi" @@ -4311,7 +4364,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "C'è stato un problema con il tuo aggiornamento. Per favore prova ancora." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Ci sono stati dei problemi con la tua segnalazione. Per favore guarda qui sotto." @@ -4328,8 +4381,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4338,7 +4391,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4356,36 +4409,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Questa email è stata inviata ad entrambi i comuni che coprono la zona del problema, visto che l'utente non ha aggiunto una categoria; per favore ignorate l'email se non siete il comune corretto che deve gestire il problema, o fateci sapere qual'e la categoria di questo problema così da poterla aggiungere nel nostro sistema." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Questa informazione è richiesta" @@ -4402,7 +4454,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4418,12 +4474,16 @@ msgstr "Questo problema non è stato risolto" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4444,7 +4504,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4455,7 +4515,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4493,7 +4553,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4522,34 +4582,34 @@ msgstr "" msgid "Total" msgstr "Totale" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "Traduzione" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "Traduzioni" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Prova ancora" @@ -4568,16 +4628,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4595,7 +4655,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Errore sconosciuto" @@ -4608,7 +4668,7 @@ msgstr "Errore sconosciuto" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4621,7 +4681,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4630,16 +4690,16 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4664,7 +4724,7 @@ msgstr "Aggiorna segnalazione come risolta" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4682,14 +4742,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Aggiornato!" @@ -4714,12 +4774,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4729,15 +4789,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4746,48 +4806,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4796,20 +4856,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Utenti" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4843,12 +4903,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4883,7 +4943,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4898,8 +4958,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Useremo le tue informazioni personali solo in accordo con la nostra politica sulla privacy." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4913,8 +4973,12 @@ msgstr "Sito web" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "" @@ -4934,14 +4998,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4962,15 +5022,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Scrivere il tuo messaggio interamente con lettere maiuscole diventa di difficile lettura, come anche una mancanza di punteggiatura." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4979,20 +5043,19 @@ msgstr "Scrivere il tuo messaggio interamente con lettere maiuscole diventa di d #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Si" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5000,7 +5063,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5013,7 +5076,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5021,7 +5084,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5039,15 +5102,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Hai rifiutato; Per favore riempi il box qui sopra " -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5113,7 +5176,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5135,9 +5198,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "La tua email" @@ -5153,10 +5217,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Il tuo nome" @@ -5172,7 +5236,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5195,7 +5259,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Il tuo numero di telefono" @@ -5220,7 +5284,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5237,25 +5301,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5289,8 +5352,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "Modifica utente" @@ -5299,12 +5362,12 @@ msgstr "Modifica utente" msgid "from %s different users" msgstr "da %s utenti differenti" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "ultimo aggiornamento %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "meno di un minuto" @@ -5315,7 +5378,7 @@ msgid "n/a" msgstr "non disponibile" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5355,7 +5418,7 @@ msgstr "" msgid "other areas:" msgstr "altre aree:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5363,7 +5426,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5380,19 +5443,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "oggi" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5408,11 +5471,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5421,35 +5484,35 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "%d indirizzo" msgstr[1] "%d indirizzi" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d giorno" msgstr[1] "%d giorni" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d ora" msgstr[1] "%d ore" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minuti" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5463,14 +5526,14 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d settimana" msgstr[1] "%d settimane" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5540,7 +5603,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s aggiornamento sulle segnalazioni" msgstr[1] "%s aggiornamenti sulle segnalazioni" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5561,7 +5624,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Non abbiamo ancora i dettagli sul comune che copre questa zona." msgstr[1] "Non abbiamo ancora i dettagli sui comuni che coprono questa zona." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po index 7bb16bfc67e..4cb765aa6d6 100644 --- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/mysociety/teams/12067/lt_LT/)\n" "Language: lt_LT\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "ir" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "ir" msgid " or " msgstr "arba" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d pakeitimai pagal %s" @@ -48,7 +48,7 @@ msgstr "%d pakeitimai pagal %s" msgid "%d to %d of %d" msgstr "%d į %d iš %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(pavyzdžiui, grafitis, šiukšlės, duobė kelyje ar gatvės apšvietim msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(neišsiųsta tarybai)" @@ -163,11 +163,11 @@ msgstr "(neišsiųsta tarybai)" msgid "(optional)" msgstr "(pasirinktinai)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(išsiųsta į abu)" @@ -176,13 +176,13 @@ msgstr "(išsiųsta į abu)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Išsirinktite kategorija --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "--Išsirinkinte šabloną--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -206,11 +206,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -235,11 +235,11 @@ msgstr "Ne Leisti patvirtinti mano atnaujinimą el. paštu" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Pastaba: Šis pranešimas jau išsiūstas vykdymui. Bet kokie pakeitimai nebus perduoti." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Pastaba: Šis pranešimas dar neišsiūstas vykdymui. Bet kokie pakeitimai nebūtinai bus perduoti." @@ -259,8 +259,8 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -270,13 +270,13 @@ msgstr "" "į kurį jūsų problema gali būti nusiųsta. Galite pridėti vieną arba daugau kontaktų (skirtingoms\n" "problemų kategorijoms) kiekvienai institucijai ." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Pridėkite kontaktą naudodami žemiau pateikta anketa" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "pridėti instituciją" @@ -297,8 +297,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Pridėti naują kategoriją" @@ -313,27 +313,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Įdėti į trumpajį sąrašą" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Pridėti vartotoją" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Pridėti/redaguoti problemų kategorijas" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Pridėti/redaguoti atsakymų prioritetus" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Pridėti/redaguoti atsakymo šablonus" @@ -341,7 +341,7 @@ msgstr "Pridėti/redaguoti atsakymo šablonus" msgid "Added %s" msgstr "Pridėta %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -370,7 +370,6 @@ msgstr "Įspėti mane apie atnaujinimus" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -417,11 +416,15 @@ msgstr "Visi pranešimai nuo %s ir %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -440,9 +443,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anoniminis:" @@ -451,29 +454,29 @@ msgstr "Anoniminis:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Vietovė pažymėta" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Šiuo metu puslapis ir %s yra neveikiantis, sukurti pranešimai bus išsiųsti problemos siuntėjui, o ne kontaktui pateiktame pranešimo kategorijoje." @@ -494,11 +497,11 @@ msgstr "Priskirti išoriniai institucijai:" msgid "Assign to subdivision:" msgstr "Priskirti padaliniui:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Priskirta to %s" @@ -510,8 +513,8 @@ msgstr " %d prašymai yra grąžinami kiekvienai užklausai. Grąžinti prašyma msgid "At the moment only searching for and looking at reports work." msgstr "Šiuo metu veikia tiktai pranešimų peržiūra ir paieška." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -527,7 +530,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -548,11 +551,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Laukiama " -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Atgal" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -560,10 +563,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -572,17 +575,17 @@ msgstr "Institucijos" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Institucija" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Institucija:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -598,7 +601,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Nematote žemėlapio? Praleiskite šitą žingsnį" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -609,15 +612,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -630,7 +633,7 @@ msgstr "Kategorija" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -640,9 +643,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Problemų kategorijoje tvarkymo sparta > 4 savaitės senumo" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -669,11 +672,11 @@ msgstr "Pakeisti slaptažodį" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -691,7 +694,7 @@ msgstr "" "interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n" "at a specific address." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -699,11 +702,11 @@ msgstr "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" "to the body too. These will appear in the drop-down menu on the report-a-problem page." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -735,9 +738,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -781,17 +788,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Nustatymai" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Patvirtinti" @@ -812,9 +819,9 @@ msgstr "" msgid "Confirmation" msgstr "Patvirtinimas" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Patvirtinta" @@ -844,7 +851,11 @@ msgstr "Susisiekite su komanda" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -853,12 +864,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Vartotojas nerastas" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Vieta nenustatyta" @@ -866,9 +877,11 @@ msgstr "Vieta nenustatyta" msgid "Council" msgstr "Taryba" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Tarybos kontaktai skirti %s" @@ -897,8 +910,8 @@ msgstr "Sukurti pranešimą" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Sukurti kategoriją" @@ -906,15 +919,15 @@ msgstr "Sukurti kategoriją" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -928,7 +941,7 @@ msgstr "Sukurti šabloną" msgid "Created" msgstr "Sukurta" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -951,12 +964,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Šiuo metu ne viena institucija nėra sukurta." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -984,32 +997,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Pašalinti šabloną" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Ištrinta" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1025,18 +1038,18 @@ msgstr "Aprašymas" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Išsamiau" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1047,7 +1060,7 @@ msgstr "Išsamiau:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Perduota" @@ -1056,24 +1069,24 @@ msgstr "Perduota" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Diligency prize league table" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1082,7 +1095,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1090,7 +1103,7 @@ msgstr "" msgid "Don’t know" msgstr "Don’t nežinau" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Nepatinka anketos?" @@ -1098,19 +1111,19 @@ msgstr "Nepatinka anketos?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1121,8 +1134,8 @@ msgstr "" "Different categories can have the same contact (email address).\n" "This means you can add many categories even if you only have one contact for the body." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1130,23 +1143,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Redaguoti" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Redaguoti institucijos informaciją" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1154,15 +1167,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1185,28 +1198,28 @@ msgstr "Redagavimo problema %d" msgid "Editing update %d" msgstr "Atnaujinimo redagavimas %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Redaguoti vartotoją %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Redaktorius" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "El. paštas" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1235,37 +1248,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "El. paštas:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1273,8 +1286,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1286,8 +1299,8 @@ msgstr "" "For more information, see \n" "this article." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1297,8 +1310,8 @@ msgstr "" "different endpoint (and send method) from the body's. For example, if reports for some categories of\n" "problem must be emailed, while others can be sent over Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1306,7 +1319,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Pabaigos taškas" @@ -1328,10 +1341,6 @@ msgstr "Įveskite artimiausia pašto kodą arba gatvės pavadinimą ir rajoną" msgid "Enter a nearby street name and area" msgstr "Įveskite artimiausios gatvės pavadinimą ir rajoną" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "įveskite problemos detales" @@ -1345,13 +1354,13 @@ msgstr "įveskite problemos detales" msgid "Error" msgstr "Klaida" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Pašto kodo pavyzdys %s" @@ -1363,11 +1372,11 @@ msgstr "Pavyzdžiai:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1384,7 +1393,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1405,25 +1414,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Papildoma informacija:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1446,11 +1455,12 @@ msgstr "" msgid "Filter report list" msgstr "Filtruoti pranešimo sąraša" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Pirmas kartas" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Suvarkyti tai pasirenkant pažymėta vietovę Redaguoti informacijąformą." @@ -1470,9 +1480,9 @@ msgstr "Sutvarkyta - Savivaldybe" msgid "Fixed - User" msgstr "Sutvarkyta - Vartotojas" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Pažymeti kaip ištrinta" @@ -1480,8 +1490,8 @@ msgstr "Pažymeti kaip ištrinta" msgid "Flag user" msgstr "Pažymėti vartotoją" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Pažymėta" @@ -1489,7 +1499,7 @@ msgstr "Pažymėta" msgid "Flagged reports and users" msgstr "Flagged reports and users" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Flagged users are listed on the flagged page." @@ -1498,7 +1508,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Pažymėta:" @@ -1514,7 +1524,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Daugiau informacijos rasite How FixMyStreet uses Mapit." @@ -1528,11 +1538,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Pamiršote slaptažodį?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1548,6 +1558,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Gauti atnaujinimus" @@ -1578,9 +1590,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1590,7 +1602,7 @@ msgstr "Pirmyn" msgid "Going to send questionnaire?" msgstr "Ar ruošiates išsiųsti klausimyną?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1598,7 +1610,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Problemų sukurimo grafikas pagal statusą per laiką" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1649,11 +1661,11 @@ msgstr "Paslėpta" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1674,9 +1686,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Paslėpti smeigtukus" @@ -1693,11 +1705,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Istorija" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Pradžia" @@ -1705,7 +1717,7 @@ msgstr "Pradžia" msgid "How to report a problem" msgstr "Kaip pranešti apie problema" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Kaip išsiųsti sėkminga pranešimą" @@ -1727,7 +1739,7 @@ msgstr "Apgailestaujame, bet jūsų problema nebuvo rasta duomenų bazėje.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1736,8 +1748,8 @@ msgstr "Apgailestaujame, bet jūsų problema nebuvo rasta duomenų bazėje.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1761,7 +1773,7 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1769,7 +1781,7 @@ msgstr "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" "the menu. Make sure you use the same category name in the bodies if you want this to happen." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1781,6 +1793,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1808,34 +1824,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Neteisėtas ID" @@ -1843,7 +1859,7 @@ msgstr "Neteisėtas ID" msgid "Illegal feed selection" msgstr "Neteisėtas srauto pasirinkimas" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1855,7 +1871,7 @@ msgstr "į piknaudžiavimo lentelę?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1871,15 +1887,15 @@ msgstr "Pridėti siuntėjo asmeninę informacija" msgid "Incorrect has_photo value \"%s\"" msgstr "Incorrect has_photo value \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1887,7 +1903,7 @@ msgstr "" msgid "Internal notes" msgstr "Internal notes" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1895,12 +1911,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Invalid agency_responsible value %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Pasirinktas klaidingas formatas %s." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1921,7 +1937,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1934,8 +1950,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Paskutinis redaktorius" @@ -1951,17 +1967,17 @@ msgstr "Paskutinis atnaujinimas:" msgid "Last update:" msgstr "Last update:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Palikite neužpildyta jeigu visi pranešimai šioje dalyje turi buti išsiųsti naudojant tą patį siuntimo metodą (pvz, \"%s\")." @@ -1969,7 +1985,7 @@ msgstr "Palikite neužpildyta jeigu visi pranešimai šioje dalyje turi buti iš msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Pateikti visas praneštas problemas" @@ -2013,16 +2029,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2030,23 +2046,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "MAP" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Žemėlapis" @@ -2054,15 +2070,15 @@ msgstr "Žemėlapis" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Mark users whose behaviour you want to keep a check on as flagged." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Žinutė" @@ -2078,19 +2094,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Missing jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2098,10 +2114,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2119,12 +2135,12 @@ msgstr "" msgid "Month" msgstr "Mėnuo" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2136,11 +2152,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2149,7 +2165,7 @@ msgstr "Vardas" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Vardas:" @@ -2159,11 +2175,11 @@ msgstr "Vardas:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2175,7 +2191,7 @@ msgstr "Artimiausia gatvė esanti šalia smeigtuko (automatiškai sugeneruota na msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Artimiausias pašto kodas esantis šalia smeigtuko žemėlapyje (sugeneruota automatiškai): %s (%sm toliau)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Artimiausia gavtė esanti šalia smeigtuko žemėlapyje (sugeneruota automatiškai naudojant Bing Maps): %s " @@ -2201,11 +2217,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Nauja dalis pridėta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Naujas kategorijos kontaktas pridetas" @@ -2241,23 +2257,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2265,7 +2281,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Naujos problemos {{COUNCIL}} {{WARD}} rajone FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2301,11 +2317,11 @@ msgstr "New state" msgid "New template" msgstr "Naujas šablonas" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2317,10 +2333,10 @@ msgstr "Kitas" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2328,11 +2344,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Ne" @@ -2340,11 +2355,7 @@ msgstr "Ne" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Nėra institucijos" @@ -2352,7 +2363,7 @@ msgstr "Nėra institucijos" msgid "No council selected" msgstr "Nepasirinkta savivaldybė" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Redagavimas dar nebuvo atliktas" @@ -2369,11 +2380,11 @@ msgstr "Pažymėti vartotojai nerasti." msgid "No further updates" msgstr "Jokių kitų atnaujinimai" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2381,12 +2392,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Jokių rezultatų" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2405,15 +2416,15 @@ msgstr "Jokių rėmėjų" msgid "None" msgstr "Nė vienas" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2437,13 +2448,13 @@ msgstr "Nebuvo pranešta anksčiau" msgid "Not reported to council" msgstr "Nepranešta savivaldybei" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Pastaba" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Pastaba:" @@ -2467,15 +2478,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "Gerai" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2483,16 +2494,16 @@ msgstr "" msgid "Old state" msgstr "Sena būklė" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2503,7 +2514,7 @@ msgstr "" msgid "Open" msgstr "Atidaryta" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2511,7 +2522,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API for the mySociety FixMyStreet server" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2543,17 +2554,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Kita" @@ -2578,8 +2589,8 @@ msgstr "Savininkas" msgid "Page Not Found" msgstr "Puslapis nerastas" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Parent" @@ -2593,19 +2604,19 @@ msgstr "Dalinis" msgid "Password (optional)" msgstr "Slaptažodis (nebūtina)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2625,17 +2636,16 @@ msgstr "Telefono numeris (nebūtina)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefonas:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2646,6 +2656,7 @@ msgstr "Telefonas:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2660,7 +2671,7 @@ msgstr "Nuotrauka" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2689,11 +2700,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Padėkite smeigtuką ant žemėlapio" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Prašome būti mandagūs, rašyti glaustai ir tiksliai." @@ -2710,7 +2725,7 @@ msgstr "Prašome patikrinti slaptažodžius ir pabandykite dar kartą" msgid "Please check your email address is correct" msgstr "Prašome patikrinti ar jūsų el. pašto adresas teisingas " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2718,11 +2733,11 @@ msgstr "Prašome patikrinti ar jūsų el. pašto adresas teisingas " msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Prašome pasirinkti kategoriją" @@ -2731,8 +2746,9 @@ msgstr "Prašome pasirinkti kategoriją" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Prašome ištaisyti klaidas " @@ -2748,13 +2764,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Prašome neįžeidinėti — įžeidinėjimai nuvertina paslaugą visiems vartotojams." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Prašome įvesti žinutę" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2762,90 +2778,90 @@ msgstr "Prašome įvesti žinutę" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Prašome įvesti slaptažodį" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Prašome įvesti temą" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Prašome įvesti galiojantį el. paštą" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Prašome įvesti galiojantį el. pašto adresą" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Prašome įvesti daugiau informacijos" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Prašome įvesti savo el. paštą" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Prašome įvesti savo vardą" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Prašome įvesti savo vardą ir pavardę, savivalldybei reikalinga jūsų informacija - jeigu pageidaujate, kad jūsų vardas nebūtu pateiktas puslapyje nužymėkite langelį apačioje" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Prašome įvesti savo vardą" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Prašome įvesti savo telefono numerį" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Prašome įvesti savo pavardę" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Prašome įvesti savo vardą" @@ -2873,7 +2889,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Prašome nurodyti, ar norite gauti kitą klausimyną." #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2899,11 +2915,11 @@ msgstr "" msgid "Please note:" msgstr "Atkreipkite dėmėsį:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2939,16 +2955,16 @@ msgstr "Prašome nurodyti, ar problema buvo sutvarkyta" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Prašome įvesti žinutę" @@ -2984,12 +3000,12 @@ msgstr "" msgid "Previous" msgstr "Ankstesnis" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -3003,14 +3019,18 @@ msgstr "Privatumas" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privatus" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problema" @@ -3033,7 +3053,7 @@ msgstr "Problema %s išsiųsta savivaldybei %s" msgid "Problem breakdown by state" msgstr "Problemos pasiskirstymas pagal valstybės" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problema pažymėta kaip atidaryta" @@ -3041,7 +3061,7 @@ msgstr "Problema pažymėta kaip atidaryta" msgid "Problem state change based on survey results" msgstr "Problemos būklės pakeitimas remiantis tyrimo rezultatais" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemos" @@ -3066,7 +3086,7 @@ msgstr "Neseniai praneštos problemos FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3091,8 +3111,8 @@ msgstr "" msgid "Property address:" msgstr "Nuosavybės adresas:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Pateikti naujinimą" @@ -3118,7 +3138,7 @@ msgstr "" msgid "Public response:" msgstr "Viešas atsakymas:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3143,6 +3163,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Anketa %d išsiųsta dėl problemos %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Questionnaire filled in by problem reporter" @@ -3166,11 +3187,11 @@ msgstr "RSS srautas skirtas %s rajonui, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "RSS srautas %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "RSS srautas %s, viduje %s rajono" @@ -3178,7 +3199,7 @@ msgstr "RSS srautas %s, viduje %s rajono" msgid "RSS feed of nearby problems" msgstr "Šalia esančių problemų RSS srautas" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3198,6 +3219,14 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3217,11 +3246,11 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3233,7 +3262,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3247,9 +3276,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3275,20 +3304,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3298,7 +3327,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3332,17 +3361,18 @@ msgid "Report, view, or discuss local problems" msgstr "Praneškite, pamatykite arba diskutuokite apie vietines problemas" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -3386,28 +3416,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3419,7 +3449,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3431,15 +3461,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3447,11 +3477,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3491,20 +3521,20 @@ msgstr "Atsakymo Šablonai" msgid "Response Templates for %s" msgstr "%s Atsakymo Šablonai" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3516,15 +3546,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3535,23 +3565,23 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -3560,12 +3590,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3575,7 +3605,8 @@ msgstr "" msgid "Search Reports" msgstr "" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "" @@ -3584,7 +3615,7 @@ msgid "Search reports" msgstr "" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" @@ -3594,7 +3625,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3610,17 +3641,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "" @@ -3640,15 +3672,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3657,7 +3689,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3684,7 +3716,7 @@ msgstr "" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3693,9 +3725,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3703,15 +3735,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3723,7 +3755,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "" @@ -3735,21 +3767,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3792,8 +3824,8 @@ msgstr "" msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3808,6 +3840,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3825,7 +3865,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3847,7 +3887,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3857,15 +3897,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3873,31 +3913,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3910,14 +3951,14 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3933,7 +3974,7 @@ msgid "Status" msgstr "" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3946,7 +3987,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3954,12 +3995,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" @@ -3977,7 +4018,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3998,7 +4039,8 @@ msgstr "" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -4006,21 +4048,29 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4040,11 +4090,11 @@ msgstr "" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4062,8 +4112,8 @@ msgstr "" msgid "Template «%s»" msgstr "Šablonas «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4073,7 +4123,7 @@ msgstr "Šablonai" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "" @@ -4117,7 +4167,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4131,11 +4181,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "" @@ -4147,53 +4197,53 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4203,8 +4253,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4219,12 +4269,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "" @@ -4270,7 +4320,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4291,20 +4341,20 @@ msgstr "" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4316,7 +4366,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4324,8 +4378,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4347,7 +4401,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -4364,8 +4418,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4374,7 +4428,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4392,36 +4446,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4438,7 +4491,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4454,12 +4511,16 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4480,7 +4541,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4491,7 +4552,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4529,7 +4590,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4558,34 +4619,34 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "" @@ -4604,16 +4665,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4631,7 +4692,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "" @@ -4644,7 +4705,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4657,7 +4718,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4666,16 +4727,16 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4700,7 +4761,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4718,14 +4779,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "" @@ -4750,12 +4811,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4765,15 +4826,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4782,48 +4843,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4832,20 +4893,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4879,12 +4940,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4919,7 +4980,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4934,7 +4995,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4949,8 +5010,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "" @@ -4970,14 +5035,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4998,15 +5059,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5015,20 +5080,19 @@ msgstr "" #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5036,7 +5100,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5049,7 +5113,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5057,7 +5121,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5075,15 +5139,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5149,7 +5213,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5171,9 +5235,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5189,10 +5254,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "" @@ -5208,7 +5273,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5231,7 +5296,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "" @@ -5256,7 +5321,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5273,25 +5338,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5325,8 +5389,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5335,12 +5399,12 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "" @@ -5351,7 +5415,7 @@ msgid "n/a" msgstr "" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5391,7 +5455,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5399,7 +5463,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5416,19 +5480,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5444,11 +5508,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5457,7 +5521,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5466,7 +5530,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5475,7 +5539,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5484,7 +5548,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5493,7 +5557,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5511,7 +5575,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5520,7 +5584,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5610,7 +5674,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5637,7 +5701,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po index 46ff2474079..67d0044b759 100644 --- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n" "Language: ms\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr " dan " -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr " dan " msgid " or " msgstr " atau " -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d suntingan daripada %s" @@ -48,7 +48,7 @@ msgstr "%d suntingan daripada %s" msgid "%d to %d of %d" msgstr "%d kepada %d daripada %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(tidak dihantar kepada majlis)" @@ -163,11 +163,11 @@ msgstr "(tidak dihantar kepada majlis)" msgid "(optional)" msgstr "(tidak diwajibkan)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(hantar kepada kedua-dua)" @@ -176,13 +176,13 @@ msgstr "(hantar kepada kedua-dua)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Pilih kategori --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -206,11 +206,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -235,11 +235,11 @@ msgstr "Tidak Benarkan aku mengesahkan kemas kiniku dengan emel msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -259,21 +259,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Tambahkan cara hubungan dengan borang dibawah" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Tambah badan" @@ -294,8 +294,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Tambah kategori baru" @@ -310,27 +310,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Tambah pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -338,7 +338,7 @@ msgstr "" msgid "Added %s" msgstr "%s telah ditambahi" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -367,7 +367,6 @@ msgstr "Maklumkan aku sebarang kemas kini masa depan" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -414,11 +413,15 @@ msgstr "Semua laporan antara %s dan %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -437,9 +440,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Tanpa Nama:" @@ -448,29 +451,29 @@ msgstr "Tanpa Nama:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Kawasan dilintungi" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -491,11 +494,11 @@ msgstr "Ditugaskan kepada badan luaran:" msgid "Assign to subdivision:" msgstr "Ditugaskan kepada bahagian bawah:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Ditugaskan kepada %s" @@ -507,8 +510,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -524,7 +527,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -545,11 +548,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Mengunggu penyederhanaan" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Balik" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -557,10 +560,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -569,17 +572,17 @@ msgstr "Badan" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Badan" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Badan:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -595,7 +598,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -606,15 +609,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -627,7 +630,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -637,9 +640,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategori rata masalah diselesai > 4 minggu" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -666,11 +669,11 @@ msgstr "Menukar Kata Laluan" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -681,17 +684,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -723,9 +726,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -769,17 +776,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurasi" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Sah" @@ -800,9 +807,9 @@ msgstr "" msgid "Confirmation" msgstr "Pengesahan" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Disahkan" @@ -832,7 +839,11 @@ msgstr "Menghubungi pasukan" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -841,12 +852,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Tidak dapat mencari pengguna" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Tidak dapat mencari lokasi" @@ -854,9 +865,11 @@ msgstr "Tidak dapat mencari lokasi" msgid "Council" msgstr "Majlis" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Hubungan Majlis untuk %s" @@ -885,8 +898,8 @@ msgstr "Laporan baru" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Kategori baru" @@ -894,15 +907,15 @@ msgstr "Kategori baru" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -916,7 +929,7 @@ msgstr "" msgid "Created" msgstr "Diwujudkan" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -939,12 +952,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Belum ada badan wujud pada masa kini." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -972,32 +985,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Dipadam" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1013,18 +1026,18 @@ msgstr "Huraian" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Perincian" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1035,7 +1048,7 @@ msgstr "Perincian:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Didelegasikan" @@ -1044,24 +1057,24 @@ msgstr "Didelegasikan" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Jadual liga hadiah ketekunan" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1070,7 +1083,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1078,7 +1091,7 @@ msgstr "" msgid "Don’t know" msgstr "Tidak tahu" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1086,19 +1099,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1106,8 +1119,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1115,23 +1128,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Menyunting" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Edit perincian badah" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1139,15 +1152,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1170,28 +1183,28 @@ msgstr "Sedang edit masalah %d" msgid "Editing update %d" msgstr "Sedang mengemaskini %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Sedang edit pengguna %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Editor" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Emel" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1220,37 +1233,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Emel:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1258,8 +1271,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1267,16 +1280,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1284,7 +1297,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Endpoint" @@ -1306,10 +1319,6 @@ msgstr "Masukkan poskod terdekat, atau nama jalan dan kawasan" msgid "Enter a nearby street name and area" msgstr "Masukkan nama jalan dan kawasan terdekat" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Masukkan perincian masalah tersebut" @@ -1323,13 +1332,13 @@ msgstr "Masukkan perincian masalah tersebut" msgid "Error" msgstr "Ralat" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Contoh poskod %s" @@ -1341,11 +1350,11 @@ msgstr "Contoh:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1362,7 +1371,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1383,25 +1392,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Data tambahan:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1424,11 +1433,12 @@ msgstr "" msgid "Filter report list" msgstr "Tapis senarai laporan" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Pertama kali" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1448,9 +1458,9 @@ msgstr "Diselesai - Majlis" msgid "Fixed - User" msgstr "Diselesai - Pengguna" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Tanda sebagai dipadam" @@ -1458,8 +1468,8 @@ msgstr "Tanda sebagai dipadam" msgid "Flag user" msgstr "Tanda pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Ditanda" @@ -1467,7 +1477,7 @@ msgstr "Ditanda" msgid "Flagged reports and users" msgstr "Laporan dan pengguna ditanda" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1476,7 +1486,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Ditanda:" @@ -1492,7 +1502,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Untuk maklumat lanjut, lihat Bagaimana FixMyStreet mengguna Mapit." @@ -1506,11 +1516,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Terlupai kata laluan anda?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1526,6 +1536,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Dapatkan kemas kini" @@ -1556,9 +1568,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1568,7 +1580,7 @@ msgstr "Pergi" msgid "Going to send questionnaire?" msgstr "Teruskan dengan menghantar soalan selidik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1576,7 +1588,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Graf masalah dibuat dengan status dari masa ke masa" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1627,11 +1639,11 @@ msgstr "Tersembunyi" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1652,9 +1664,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Sembunyikan pin" @@ -1671,11 +1683,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Sejarah" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Home" @@ -1683,7 +1695,7 @@ msgstr "Home" msgid "How to report a problem" msgstr "Bagaimana melaporkan masalah" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Bagaimana untuk menghantar laporan berjaya" @@ -1705,7 +1717,7 @@ msgstr "Masalah anda tidak dapat dijumpai dalam database.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1714,8 +1726,8 @@ msgstr "Masalah anda tidak dapat dijumpai dalam database.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1737,13 +1749,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1755,6 +1767,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1782,34 +1798,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID tak sah" @@ -1817,7 +1833,7 @@ msgstr "ID tak sah" msgid "Illegal feed selection" msgstr "Pilihan feed yang tak sah" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1829,7 +1845,7 @@ msgstr "Dalam table penyalahguna?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1845,15 +1861,15 @@ msgstr "Termasuk perincian peribadi pelapor" msgid "Incorrect has_photo value \"%s\"" msgstr "Nilai has_photo \"%s\" salah" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1861,7 +1877,7 @@ msgstr "" msgid "Internal notes" msgstr "Nota dalaman" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1869,12 +1885,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Nilai agency_responsible %s salah" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Format dinyatakan %s salah" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1895,7 +1911,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1908,8 +1924,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Editor terakhir" @@ -1925,17 +1941,17 @@ msgstr "Kemas kini terakhir:" msgid "Last update:" msgstr "Kemas kini terakhir:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1943,7 +1959,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Senaraikan semua laporan masalah" @@ -1987,16 +2003,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2004,23 +2020,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "PETA" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2028,15 +2044,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Pesanan" @@ -2052,19 +2068,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Kehilangan jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2072,10 +2088,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2093,12 +2109,12 @@ msgstr "" msgid "Month" msgstr "Bulan" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2110,11 +2126,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2123,7 +2139,7 @@ msgstr "Nama" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Nama:" @@ -2133,11 +2149,11 @@ msgstr "Nama:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2149,7 +2165,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2173,11 +2189,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Badan baru ditambahi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Kategori hubungan baru ditambahi" @@ -2213,23 +2229,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2237,7 +2253,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Masalah baru untuk {{COUNCIL}} dalam {{WARD}} kawasan pentadbiran dalam FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2273,11 +2289,11 @@ msgstr "Negeri baru" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2289,10 +2305,10 @@ msgstr "Seterusnya" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2300,11 +2316,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Tidak" @@ -2312,11 +2327,7 @@ msgstr "Tidak" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Tiada badan" @@ -2324,7 +2335,7 @@ msgstr "Tiada badan" msgid "No council selected" msgstr "Tiada majlis dipilihi" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Belum ada edit yang dibuat." @@ -2341,11 +2352,11 @@ msgstr "Belum ada pengguna yang ditanda." msgid "No further updates" msgstr "Tiada kemaskini baru." -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2353,12 +2364,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Tiada keputusan." -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2375,15 +2386,15 @@ msgstr "Tiada penyokong" msgid "None" msgstr "Tiada" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2403,13 +2414,13 @@ msgstr "Belum dilaporkan" msgid "Not reported to council" msgstr "Tidak dilaporkan kepada majlis" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Nota" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "ta:" @@ -2433,15 +2444,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2449,16 +2460,16 @@ msgstr "" msgid "Old state" msgstr "Keadaan lama" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2469,7 +2480,7 @@ msgstr "" msgid "Open" msgstr "Terbuka" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2477,7 +2488,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 untuk pelayan FixMyStreet mySociety" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2509,17 +2520,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Lain-lain" @@ -2544,8 +2555,8 @@ msgstr "Pemilik" msgid "Page Not Found" msgstr "Laman Tidak Dijumpai" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Induk" @@ -2559,19 +2570,19 @@ msgstr "Separa" msgid "Password (optional)" msgstr "Kata Laluan (tidah diwajibkan)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2591,17 +2602,16 @@ msgstr "Nombor telefon (tidak diwajibkan)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefon:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2612,6 +2622,7 @@ msgstr "Telefon:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2626,7 +2637,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2655,11 +2666,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Letakkan pin atas peta" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Sila bersopan, ringkas dan tepat." @@ -2676,7 +2691,7 @@ msgstr "Sila periksa kata laluan dan cuba lagi" msgid "Please check your email address is correct" msgstr "Sila periksa sama ada alamat emel anda adalah betul" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2684,11 +2699,11 @@ msgstr "Sila periksa sama ada alamat emel anda adalah betul" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Sila pilihkan kategori" @@ -2697,8 +2712,9 @@ msgstr "Sila pilihkan kategori" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2714,13 +2730,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Sila masukkan pesanan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2728,90 +2744,90 @@ msgstr "Sila masukkan pesanan" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Sila masukkan kata laluan" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Sila masukkan tajuk" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Silah masukkan emel yang benar" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Sila masukkan alamat emel yang benah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Sila masukkan perincian" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Sila masukkan emel anda" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Sila masukkan nama pertama anda" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika anda tidak ingin nama anda dikemukakan dalam laman, untik kota dibawah" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Sila masukkan nama anda" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Sila masukkan nombor telefon anda" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Sila masukkan nama kedua anda" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Sila masukkan tajuk anda" @@ -2839,7 +2855,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2865,11 +2881,11 @@ msgstr "" msgid "Please note:" msgstr "Sila nota:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2905,16 +2921,16 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Sila tuliskan pesanan" @@ -2950,12 +2966,12 @@ msgstr "" msgid "Previous" msgstr "Sebelumnya" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2969,14 +2985,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Peribadi" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Masalah" @@ -2999,7 +3019,7 @@ msgstr "Masalah %s dihantar kepada majlis %s" msgid "Problem breakdown by state" msgstr "Pecahan masalah bagi negeri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Masalah ditanda sebagai terbukan" @@ -3007,7 +3027,7 @@ msgstr "Masalah ditanda sebagai terbukan" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Masalah-masalah" @@ -3032,7 +3052,7 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3057,8 +3077,8 @@ msgstr "" msgid "Property address:" msgstr "Alamat bangunan" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Sediakan kemas kini" @@ -3084,7 +3104,7 @@ msgstr "" msgid "Public response:" msgstr "Tindak balas awam:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3109,6 +3129,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Soalan selidik %d dihantar untuk masalah %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Soalan selidik diisikan oleh pelapor masalah" @@ -3132,11 +3153,11 @@ msgstr "Feed RSS untuk kawasan pentadbiran %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "Feed RSS untuk %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s" @@ -3144,7 +3165,7 @@ msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s" msgid "RSS feed of nearby problems" msgstr "Feed RSS untuk masalah berdekatan" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3164,6 +3185,14 @@ msgstr "Feed RSS untuk masalah tempatan baru-baru ini" msgid "RSS feed of updates to this problem" msgstr "Feed RSS untuk kemas kini bagi masalah ini" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3183,11 +3212,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Masalah yang dilaporkan baru-baru ini" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3199,7 +3228,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3213,9 +3242,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3241,20 +3270,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3264,7 +3293,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3298,17 +3327,18 @@ msgid "Report, view, or discuss local problems" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -3352,28 +3382,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3385,7 +3415,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3397,15 +3427,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3413,11 +3443,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3457,20 +3487,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3482,15 +3512,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3501,23 +3531,23 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -3526,12 +3556,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3541,7 +3571,8 @@ msgstr "" msgid "Search Reports" msgstr "" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "" @@ -3550,7 +3581,7 @@ msgid "Search reports" msgstr "" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" @@ -3560,7 +3591,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3576,17 +3607,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Pilihkan badan" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Pilihkan kawasan" @@ -3606,15 +3638,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3623,7 +3655,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3650,7 +3682,7 @@ msgstr "Servis:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3659,9 +3691,9 @@ msgid "Share" msgstr "Kongsi" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3669,15 +3701,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3689,7 +3721,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Tunjukkan nama aku secara umum" @@ -3701,21 +3733,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Tunjukkan pin" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3758,8 +3790,8 @@ msgstr "Log keluar" msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3774,6 +3806,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3791,7 +3831,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3813,7 +3853,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3823,15 +3863,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3839,31 +3879,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Negeri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3876,14 +3917,14 @@ msgstr "" msgid "State:" msgstr "Negeri:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3899,7 +3940,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3912,7 +3953,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3920,12 +3961,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Bahagian bawah/Badan" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Tajuk" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Tajuk:" @@ -3943,7 +3984,7 @@ msgstr "Hantar" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3964,7 +4005,8 @@ msgstr "Dihantarkan" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Melanggan" @@ -3972,21 +4014,29 @@ msgstr "Melanggan" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4006,11 +4056,11 @@ msgstr "Laporan ringkasan" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4028,8 +4078,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4039,7 +4089,7 @@ msgstr "" msgid "Text" msgstr "Teks" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Versi teks sahaja" @@ -4083,7 +4133,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4097,11 +4147,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "" @@ -4113,53 +4163,53 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4169,8 +4219,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4185,12 +4235,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "" @@ -4236,7 +4286,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4257,20 +4307,20 @@ msgstr "" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4282,7 +4332,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4290,8 +4344,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4313,7 +4367,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -4330,8 +4384,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4340,7 +4394,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4358,36 +4412,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4404,7 +4457,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4420,12 +4477,16 @@ msgstr "Masalah ini belum diselesai" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Laporan ini menunggui sederhana." @@ -4446,7 +4507,7 @@ msgstr "Laporan ini ditanda sebagai terbuka sekarang." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh pengguna." @@ -4457,7 +4518,7 @@ msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh penggu msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Garis masa" @@ -4495,7 +4556,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Melihat lokasi tepat atas peta bagi isu ini" @@ -4524,34 +4585,34 @@ msgstr "" msgid "Total" msgstr "Jumlah" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Cuba lagi" @@ -4570,16 +4631,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4597,7 +4658,7 @@ msgstr "Jenis pemberitahuan tak diketahui" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Ralat tidak diketahui" @@ -4610,7 +4671,7 @@ msgstr "Ralat tidak diketahui" msgid "Unknown problem ID" msgstr "ID masalah tidak diketahui" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4623,7 +4684,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Kemas kini" @@ -4632,16 +4693,16 @@ msgstr "Kemas kini" msgid "Update %s created for problem %d; by %s" msgstr "Kemaskini %s dibuat untuk masalah %d; oleh %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Kemaskini di bawah ditambahkan tanpa nama pada %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Kemaskini di bawah ditambah oleh %s pada %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Kemas kini badan" @@ -4666,7 +4727,7 @@ msgstr "Kemas kini menanda masalah sebagai diselesai" msgid "Update reopened problem" msgstr "Kemas kini masalah dibuka semula" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Status kemas kini" @@ -4684,14 +4745,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Dikemas kinikan!" @@ -4716,12 +4777,12 @@ msgstr "Kemas kini atas {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4731,15 +4792,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4748,48 +4809,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Tanda pengguna dipadam" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Pengguna ditanda" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4798,20 +4859,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Pengguna" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Nilai dikemaskinikan" @@ -4845,12 +4906,12 @@ msgstr "Melihat laporan dengan kawasan pentadbiran" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Melihat lokasi" @@ -4885,7 +4946,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Kita sedar bahawa masalah ini mungkin tanggungjawab %s; tetapi, pada masa kini kita tiada maklumat hubungan mereka. Jika anda tahu hubungan sewajanya, sila menghubungi mereka" @@ -4900,7 +4961,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4915,8 +4976,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Bila diedit" @@ -4936,14 +5001,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4964,15 +5025,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4981,20 +5046,19 @@ msgstr "" #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ya" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5002,7 +5066,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5015,7 +5079,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5023,7 +5087,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5041,15 +5105,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Anda menolak; sila isikan kotak di atas" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5115,7 +5179,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Anda perlu tambah badan(seperti majlis atau jabatan) sebelum laporan mana-mana boleh dihantar." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5140,9 +5204,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Emel Anda" @@ -5158,10 +5223,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Maklumat anda akan digunakan mengikuti dasar privasi kita" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Nama anda" @@ -5177,7 +5242,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5200,7 +5265,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Nombor telefon anda" @@ -5225,7 +5290,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5242,25 +5307,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5294,8 +5358,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "edit pengguna" @@ -5304,12 +5368,12 @@ msgstr "edit pengguna" msgid "from %s different users" msgstr "dari %s pengguna lain" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "kemaskini yang lepas %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "kurang dari seminit" @@ -5320,7 +5384,7 @@ msgid "n/a" msgstr "tiada" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5360,7 +5424,7 @@ msgstr "pemasukan asal: “%s”" msgid "other areas:" msgstr "kawasan lain:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5368,7 +5432,7 @@ msgstr "" msgid "sign out" msgstr "log keluar" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5385,19 +5449,19 @@ msgstr "pin tidak ditunjukkan sebab pengguna tidak menggunakan peta" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "jenis masalah tempatan ini" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "hari ini" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5413,11 +5477,11 @@ msgstr "pengguna adalah dari majlis yang sama dengan masalah - %d" msgid "user is problem owner" msgstr "pengguna adalah pemilik masalah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5426,31 +5490,31 @@ msgstr "" msgid "ward" msgstr "kawasan pentadbiran" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d hari" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d jam" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minit" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5462,13 +5526,13 @@ msgid "%d supporter" msgid_plural "%d supporters" msgstr[0] "%d penyokong" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d minggu" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5528,7 +5592,7 @@ msgid "%s update on reports" msgid_plural "%s updates on reports" msgstr[0] "%s laporan dikemaskini" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5546,7 +5610,7 @@ msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." msgstr[0] "Kita belum ada maklumat tentang majlis yang menutupi lokasi ini" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po index c8923e799da..44702b7d851 100644 --- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Burmese (Myanmar) (https://www.transifex.com/mysociety/teams/12067/my_MM/)\n" "Language: my_MM\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "ႏွင့္" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "ႏွင့္" msgid " or " msgstr "သို႔မဟုတ္" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%s မွ %d ကိုျပင္ဆင္ခဲ့သည္" @@ -48,7 +48,7 @@ msgstr "%s မွ %d ကိုျပင္ဆင္ခဲ့သည္" msgid "%d to %d of %d" msgstr "%d မွ %d ၏ %d သို႔" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(ဂရပ္ဖီတီ၊ စည္းကမ္းမဲ့ အမိ msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(ေကာင္စီသို႔မပို႔ပါ)" @@ -163,11 +163,11 @@ msgstr "(ေကာင္စီသို႔မပို႔ပါ)" msgid "(optional)" msgstr "(ေရြးခ်ယ္ႏိုင္ခြင့္)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(ႏွစ္ခုလံုးသို႔ပို႔မည္)" @@ -176,13 +176,13 @@ msgstr "(ႏွစ္ခုလံုးသို႔ပို႔မည္)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- ေခါင္းစဥ္တစ္ခုေရြးပါ --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -232,11 +232,11 @@ msgstr "မဟုတ္ပါ ကၽြႏ္ုပ္၏အသ msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "အုပ္ခ်ဳပ္ေရး အဖြဲ႔တစ္ခုခ်င္းစီအတြက္ အဖြဲ႔တစ္ခုကို ေပါင္းထည့္ပါ။ အႀကံေပးအဖြဲ႔ သို႔မဟုတ္ ႒ာနတစ္ခုကဲ့သို႔ အဖြဲ႔ကို ျပႆနာ တင္ျပႏိုင္သည္။ သင့္အေနျဖင့္ အဖြဲ႔တစ္ခုခ်င္းစီကို (ျပႆနာထဲမွ မတူညီသည့္ ျပႆနာမ်ားအတြက္) ဆက္သြယ္ရမည့္လိပ္စာ တစ္ခု သို႔မဟုတ္ အမ်ားကို ေပါင္းထည့္ပါ။" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "ေအာက္ပါပံုစံကိုသံုးျပီးအဆက္အသြယ္တစ္ခုထည့္မည္" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "စာကိုယ္ထည့္မည္" @@ -291,8 +291,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "ေခါင္းစဥ္အသစ္ထည့္မည္" @@ -307,27 +307,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "အသံုးျပဳသူထည့္မည္" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -335,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "%sကိုထည့္ျပီးျပီ" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "ေနာက္ထပ္အသစ္မ်ားအတြက္လည္ msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "%s ႏွင့္ %s ၾကားအစီရင္ခံစားအ msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "အမည္မသိ-" @@ -445,29 +448,29 @@ msgstr "အမည္မသိ-" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "ဧရိယာလႊမ္းျခံဳ ျခင္း" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -488,11 +491,11 @@ msgstr "အပိုစာကိုယ္ကိုသတ္မွတ္မည္ msgid "Assign to subdivision:" msgstr "အေသးစိတ္နယ္နမိတ္သို႔သတ္မွတ္မည္-" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "%s သို႔ လြဲအပ္မည္" @@ -504,8 +507,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "အခုေလာေလာဆယ္ အစီရင္ခံစာမ်ားကို ရွာေဖြျခင္း၊ၾကည့္ရႈျခင္းသာျပဳလုပ္ႏိုင္ေသးသည္" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "စိစစ္ျခင္းကိုေစာင့္ဆိုင္းေနတုန္း" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "ေနာက္သို႔" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -554,10 +557,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "စာကိုယ္မ်ား" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "စာကိုယ္" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "စာကိုယ္ -" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -592,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "ေျမပံုကိုမျမင္ဘူးလား။ ဒီအဆင့္ကိုေက်ာ္မည္ " -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "အမ်ိဳးအစား" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "စကား၀ွက္ေျပာင္းမည္" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -678,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -720,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,17 +773,17 @@ msgstr "" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "အစီအစဥ္သတ္မွတ္ျခင္း" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "အတည္ျပဳမည္" @@ -797,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "အတည္ျပဳျခင္း" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "အတည္ျပဳခဲ့သည္" @@ -829,7 +836,11 @@ msgstr "အဖြဲ႕ႏွင့္ဆက္သြယ္ပါ" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -838,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "အသံုးျပဳသူရွာမေတြ႕ပါ" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "တည္ေနရာကိုရွာမေတြ႕ပါ" @@ -851,9 +862,11 @@ msgstr "တည္ေနရာကိုရွာမေတြ႕ပါ" msgid "Council" msgstr "ေကာင္စီ" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "%sအတြက္ေကာင္စီအဆက္အသြယ္" @@ -882,8 +895,8 @@ msgstr "အစီရင္ခံစာတစ္ခုကိုဖန္တီး msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "အမ်ိဳးအစားဖန္တီးမည္" @@ -891,15 +904,15 @@ msgstr "အမ်ိဳးအစားဖန္တီးမည္" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +926,7 @@ msgstr "" msgid "Created" msgstr "ဖန္တီးမည္" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -936,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "ယခုေလာေလာဆယ္ စာကိုယ္ ကိုမဖန္တီးရေသးပါ" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -969,32 +982,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "ဖ်က္ျပီးျပီ" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1010,18 +1023,18 @@ msgstr "ေဖာ္ျပခ်က္" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "အေသးစိတ္အခ်က္အလက္" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1032,7 +1045,7 @@ msgstr "အေသးစိတ္အခ်က္အလက္မ်ား-" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "တစ္ေယာက္မွတစ္ေယာက္လက္လြဲျခင္း" @@ -1041,24 +1054,24 @@ msgstr "တစ္ေယာက္မွတစ္ေယာက္လက္လြဲ msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1067,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1083,19 +1096,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1103,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1112,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "ျပင္ဆင္မည္" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1136,15 +1149,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1167,28 +1180,28 @@ msgstr "%dျပႆနာကိုျပင္ဆင္ေနသည္" msgid "Editing update %d" msgstr "အသစ္မြမ္းမံျခင္း %dကိုျပင္ဆင္ေနသည္" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "%dအသံုးျပဳသူကိုျပင္ဆင္ေနသည္" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "အယ္ဒီတာ" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "အီးေမးလ္" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1217,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "အီးေမးလ္-" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1255,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1264,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1281,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "ျပီးဆံုးမွတ္-" @@ -1303,10 +1316,6 @@ msgstr "အနီးနားရွိ စာတိုက္နံပါတ္ msgid "Enter a nearby street name and area" msgstr "အနီးနားရွိလမ္းအမည္ႏွင့္ဧရိယာကိုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "ျပႆနာ၏အေသးစိတ္အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ" @@ -1320,13 +1329,13 @@ msgstr "ျပႆနာ၏အေသးစိတ္အခ်က္အလက္မ msgid "Error" msgstr "အမွားအယြင္း" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "နမူနာစာတိုက္ေသတၱာနံပါတ္ %s" @@ -1338,11 +1347,11 @@ msgstr "နမူနာမ်ား -" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1359,7 +1368,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1380,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1421,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "အစီရင္ခံစာစာရင္းကိုစစ္ထုတ္မည္" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "ပထမအၾကိမ္" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1445,9 +1455,9 @@ msgstr "ျပင္ျပီးျပီ-ေကာင္စီ" msgid "Fixed - User" msgstr "ျပင္ျပီးျပီ-အသံုးျပဳသူ" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "ဖ်က္ျပီးျပီဟုသတ္မွတ္မည္" @@ -1455,8 +1465,8 @@ msgstr "ဖ်က္ျပီးျပီဟုသတ္မွတ္မည္" msgid "Flag user" msgstr "သတ္မွတ္သည့္အသံုးျပဳသူ" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "" @@ -1464,7 +1474,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "အမွတ္အသားျပဳလုပ္ထားသည့္ အသံုးျပဳသူမ်ားကို ေဖာ္ျပျခင္း" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1473,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "အမွတ္အသားျပဳလုပ္ထားျခင္း" @@ -1489,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1503,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "သင္၏စကား၀ွက္ေမ့သြားျပီလား။" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1523,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္" @@ -1553,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1565,7 +1577,7 @@ msgstr "သြားမည္" msgid "Going to send questionnaire?" msgstr "စစ္တမ္းကိုပို႔ေတာ့မွာလား။" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1624,11 +1636,11 @@ msgstr "ေဖ်ာက္ထားေသာ" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1649,9 +1661,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "" @@ -1668,11 +1680,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "ရာဇ၀င္" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "ပင္မ" @@ -1680,7 +1692,7 @@ msgstr "ပင္မ" msgid "How to report a problem" msgstr "ျပႆနာကိုဘယ္လိုအစီရင္ခံစာတင္မလဲ။" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "ေကာင္းမြန္ေသာအစီရင္ခံစာကိုဘယ္လိုပို႔မလဲ" @@ -1702,7 +1714,7 @@ msgstr "" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1711,8 +1723,8 @@ msgstr "" msgid "ID" msgstr "အိုင္ဒီ" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1734,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1752,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1779,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "တရားမ၀င္ေသာအိုင္ဒီ" @@ -1814,7 +1830,7 @@ msgstr "တရားမ၀င္ေသာအိုင္ဒီ" msgid "Illegal feed selection" msgstr "တရားမ၀င္ေသာအိုင္ဒီ" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1826,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1842,15 +1858,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1858,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "အတြင္းမွတ္စု" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1866,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "ပံုစံ %s သည္မမွန္ကန္ပါ" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1892,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1905,8 +1921,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "ေနာက္ဆံုးအယ္ဒီတာ" @@ -1922,17 +1938,17 @@ msgstr "ေနာက္ဆံုးအသစ္မြမ္းမံျခင္ msgid "Last update:" msgstr "" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1940,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "အစီရင္ခံစာတင္ျပီးေသာျပႆနာစာရင္းအားလံုး" @@ -1984,16 +2000,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2001,23 +2017,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "ေျမပံု" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2025,15 +2041,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "စာ" @@ -2049,19 +2065,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2069,10 +2085,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2090,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "လ" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2107,11 +2123,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2120,7 +2136,7 @@ msgstr "အမည္" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "အမည္-" @@ -2130,11 +2146,11 @@ msgstr "အမည္-" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2146,7 +2162,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2170,11 +2186,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "စာကိုယ္အသစ္ထည့္ျပီးျပီ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "ေခါင္းစဥ္အသစ္အဆက္အသြယ္ထည့္ျပီးျပီ" @@ -2210,23 +2226,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2234,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2270,11 +2286,11 @@ msgstr "ျမိဳ႕အသစ္" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2286,10 +2302,10 @@ msgstr "ေနာက္သို႔" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2297,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "မရွိပါ" @@ -2309,11 +2324,7 @@ msgstr "မရွိပါ" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "စာကိုယ္မရွိ" @@ -2321,7 +2332,7 @@ msgstr "စာကိုယ္မရွိ" msgid "No council selected" msgstr "မည္သည့္ေကာင္စီမွမေရြးရေသးပါ" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "" @@ -2338,11 +2349,11 @@ msgstr "" msgid "No further updates" msgstr "အသစ္မြမ္းမံမႈမ်ားမေတြ႕ပါ" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2350,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "ရလဒ္မေတြ႕ပါ" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2372,15 +2383,15 @@ msgstr "ေထာက္ပံ့ေပးမည့္သူမရွိပါ" msgid "None" msgstr "ဘာမွမဟုတ္" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2400,13 +2411,13 @@ msgstr "ယခင္ကအစီရင္မခံရေသး" msgid "Not reported to council" msgstr "ေကာင္စီသို႔အစီရင္မခံရေသး" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "မွတ္စု" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "မွတ္စု -" @@ -2430,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "အိုေက" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2446,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "ျပည္နယ္အေဟာင္း" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2466,7 +2477,7 @@ msgstr "" msgid "Open" msgstr "ဖြင့္မည္" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2474,7 +2485,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "mySociety FixMyStreet ဆာဗာအတြက္ ၃၁၁ API ကိုဖြင့္မည္" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2506,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "တျခား" @@ -2541,8 +2552,8 @@ msgstr "ပိုင္ရွင္" msgid "Page Not Found" msgstr "စာမ်က္ႏွာရွာမေတြ႕ပါ" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "ပင္မ" @@ -2556,19 +2567,19 @@ msgstr "တစ္၀က္" msgid "Password (optional)" msgstr "စကား၀ွက္(ထည့္ခ်င္မွထည့္ပါ)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "အျမဲတမ္းလင့္ခ္" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2588,17 +2599,16 @@ msgstr "ဖုန္းနံပါတ္(ထည့္ခ်င္မွထည msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "ဖုန္း-" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2609,6 +2619,7 @@ msgstr "ဖုန္း-" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2623,7 +2634,7 @@ msgstr "ဓာတ္ပံု" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2652,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "ေျမပံုတြင္ပင္တစ္ခုထားမည္" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" @@ -2673,7 +2688,7 @@ msgstr "စကား၀ွက္ကိုျပန္စစ္ေဆးျပီ msgid "Please check your email address is correct" msgstr "သင္၏အီးေမးလ္လိပ္စာမွန္၊မမွန္ကိုစစ္ေဆးပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,11 +2696,11 @@ msgstr "သင္၏အီးေမးလ္လိပ္စာမွန္၊မ msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "ေခါင္းစဥ္တစ္ခုကိုေရြးပါ" @@ -2694,8 +2709,9 @@ msgstr "ေခါင္းစဥ္တစ္ခုကိုေရြးပါ" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2711,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "စာတစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,90 +2741,90 @@ msgstr "စာတစ္ခုရိုက္ထည့္ပါ" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "စကား၀ွက္တစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "ေခါင္းစီးတစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "မွန္ကန္ေသာအီးေမးလ္တစ္ခုရိုက္ထည့္ပါ" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "မွန္ကန္ေသာအီးေမးလ္လိပ္စာတစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "တစ္ခ်ိဳ႕အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "သင္၏အီးေမးလ္ကိုရိုက္ထည့္ပါ" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "သင္၏ပထမအမည္ကိုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "သင္၏အမည္ကိုရိုက္ထည့္ပါ" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "သင္၏ဖုန္းနံပါတ္ကိုရိုက္ထည့္ပါ" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "သင္၏ဒုတိယအမည္ကိုရိုက္ထည့္ပါ" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "သင္၏ေခါင္းစဥ္ကိုရိုက္ထည့္ပါ" @@ -2836,7 +2852,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2862,11 +2878,11 @@ msgstr "" msgid "Please note:" msgstr "ေက်းဇူးျပဳျပီးမွတ္သားပါ-" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2902,16 +2918,16 @@ msgstr "ျပႆနာေျဖရွင္းျပီးျပီ၊မရွ #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "စာတစ္ေၾကာင္းေရးပါ" @@ -2947,12 +2963,12 @@ msgstr "" msgid "Previous" msgstr "ယခင္က" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2966,14 +2982,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "ကိုယ္ပိုင္" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "ျပႆနာ" @@ -2996,7 +3016,7 @@ msgstr "ေကာင္စီ %s သို႔ ျပႆနာ %s ကိုပိ msgid "Problem breakdown by state" msgstr "ျပည္နယ္မွ ျပႆနာကိုထပ္မံခြဲစိတ္လိုက္သည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "ျပႆနာကို ဖြင့္ထားသည္" @@ -3004,7 +3024,7 @@ msgstr "ျပႆနာကို ဖြင့္ထားသည္" msgid "Problem state change based on survey results" msgstr "စစ္ေဆးမႈရလဒ္မ်ားအေပၚတြင္ မူတည္ၿပီး ျပႆနာ အေျခအေန ေျပာင္းလဲသည္။" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "ျပႆနာမ်ား" @@ -3029,7 +3049,7 @@ msgstr "FixMyStreet ေပၚတြင္ လတ္တေလာ တင္ျပ msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3054,8 +3074,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" @@ -3081,7 +3101,7 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3106,6 +3126,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "%d ျပႆနာ အတြက္ %d ေပးပို႔သည့္ စစ္တမ္းေမးခြန္းလႊာ" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "ျပႆနာ အစီရင္ခံသူ ျဖည့္စြက္ရမည့္ စစ္တမ္းေမးခြန္းလႊာ" @@ -3129,11 +3150,11 @@ msgstr "%s အုပ္ခ်ဳဳပ္ေရးဌာန %s အတြက္ R #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "%s ၏ RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရိွ %s ၏ RSS feed" @@ -3141,7 +3162,7 @@ msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရ msgid "RSS feed of nearby problems" msgstr "အနီးအနားရိွ ျပႆနာမ်ား၏ RSS feed" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3161,6 +3182,14 @@ msgstr "လတ္တေလာ ျပည္တြင္း ျပႆနာမ် msgid "RSS feed of updates to this problem" msgstr "လက္ရိွ ျပႆနာကို update ျပဳလုပ္ထားသည့္ RSS feed" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3180,11 +3209,11 @@ msgstr "" msgid "Recently reported problems" msgstr "ျပႆနာမ်ားကို မၾကာေသးမီက အစီရင္ခံ တင္ျပၿပီး" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3196,7 +3225,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3210,9 +3239,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3238,20 +3267,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပရန္" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3261,7 +3290,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3295,17 +3324,18 @@ msgid "Report, view, or discuss local problems" msgstr "ေဒသတြင္း ျပႆနာမ်ားကို အစီရင္ခံျခင္း၊ ၾကည့္႐ႈျခင္းႏွင့္ ေဆြးေႏြးျခင္း" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -3349,28 +3379,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပျခင္း" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3382,7 +3412,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3394,15 +3424,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3410,11 +3440,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3454,20 +3484,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3479,15 +3509,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "ဘယ္ဘက္ကို လွည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3498,23 +3528,23 @@ msgstr "ညာဘက္ကို လွည့္ပါ" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "ေျပာင္းလဲမႈမ်ားကို သိမ္းဆည္းရန္" @@ -3523,12 +3553,12 @@ msgstr "ေျပာင္းလဲမႈမ်ားကို သိမ္း msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3538,7 +3568,8 @@ msgstr "" msgid "Search Reports" msgstr "အစီရင္ခံစာမ်ားကို ရွာေဖြရန္" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "" @@ -3547,7 +3578,7 @@ msgid "Search reports" msgstr "အစီရင္ခံစာမ်ားကို ရွာေဖြရန္" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" @@ -3557,7 +3588,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3573,17 +3604,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "စာကိုယ္တစ္ခုကို ေရြးပါ။" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "ဧရိယာတစ္ခုကို ေရြးပါ။" @@ -3603,15 +3635,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3620,7 +3652,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3647,7 +3679,7 @@ msgstr "" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3656,9 +3688,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3666,15 +3698,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3686,7 +3718,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "" @@ -3698,21 +3730,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3755,8 +3787,8 @@ msgstr "" msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3771,6 +3803,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3788,7 +3828,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3810,7 +3850,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3820,15 +3860,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3836,31 +3876,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3873,14 +3914,14 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3896,7 +3937,7 @@ msgid "Status" msgstr "" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3909,7 +3950,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3917,12 +3958,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" @@ -3940,7 +3981,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3961,7 +4002,8 @@ msgstr "" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -3969,21 +4011,29 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4003,11 +4053,11 @@ msgstr "အစီရင္ခံစာအက်ဥ္းခ်ဳပ္" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4025,8 +4075,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4036,7 +4086,7 @@ msgstr "" msgid "Text" msgstr "စာ" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "စာဗားရွင္းသာ" @@ -4080,7 +4130,7 @@ msgstr "ေက်းဇူးတင္ပါသည္။ ျပင္ဆင္ msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4094,11 +4144,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "ထိုျပႆနာကိုယခုပင္ျပန္ပို႔ပါမည္" @@ -4110,53 +4160,53 @@ msgstr "ဒီအစီရင္ခံစာကို %s ေပၚတြင္ msgid "That report has been removed from FixMyStreet." msgstr "ကၽြႏ္ုပ္လမ္းကိုျပင္ေပးပါ မွဒီအစီရင္ခံစာကိုဖယ္ျပီးပါျပီ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4166,8 +4216,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4182,12 +4232,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "ခ်ိဳ႕ယြင္းမႈမွာ - %s" @@ -4233,7 +4283,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4254,20 +4304,20 @@ msgstr "သင္ေတာင္းဆိုေသာ URL %s ကိုဒီဆ msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4279,7 +4329,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4287,8 +4341,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4310,7 +4364,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -4327,8 +4381,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4337,7 +4391,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4355,36 +4409,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "ဒီအခ်က္အလက္ ျဖည့္စြက္ရန္ လိုအပ္သည္" @@ -4401,7 +4454,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4417,12 +4474,16 @@ msgstr "ဒီျပႆနာကိုမေျဖရွင္းရေသးပ msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "ဒီအစီရင္ခံစာသည္အတည္ျပဳျခင္းကိုေစာင့္ဆိုင္းေနဆဲျဖစ္သည္" @@ -4443,7 +4504,7 @@ msgstr "ဒီအစီရင္ခံစာကိုယခုေလာေလာ msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "ဒီ web စာမ်က္ႏွာသည္ အသံုးျပဳသူမွရိုက္ထားေသာ ျပႆနာ၏ဓာတ္ပံုတစ္ပံုပါ၀င္သည္" @@ -4454,7 +4515,7 @@ msgstr "ဒီ web စာမ်က္ႏွာသည္ အသံုးျပဳ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4492,7 +4553,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4521,34 +4582,34 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "" @@ -4567,16 +4628,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4594,7 +4655,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "" @@ -4607,7 +4668,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4620,7 +4681,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4629,16 +4690,16 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4663,7 +4724,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4681,14 +4742,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "" @@ -4713,12 +4774,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4728,15 +4789,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4745,48 +4806,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "သုံးစြဲသူ အမွတ္အသား ျပဳလုပ္ျခင္းကို ဖယ္ရွားလိုက္သည္။" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "သုုံးစြဲသူက အမွတ္အသား ျပဳလုပ္ျခင္း" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "သုံးစြဲသူရွာေဖြမႈသည္ ၎တို႔၏ အီးေမးလိပ္စာႏွင့္ နာမည္မ်ားရွိ တူညီမႈမ်ားကို ေတြ႔ရွိႏိုင္သည္။ " -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4795,20 +4856,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "အသံုးျပဳသူမ်ား" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4842,12 +4903,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "တည္ေနရာကို စိစစ္ျခင္း" @@ -4882,7 +4943,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "မိမိတို႔သည္ %s; ၏တာဝန္ျဖစ္ေၾကာင္း သတိျပဳမိေသာ္လည္း မိမိတို႔တြင္ ၎တို႔ကို ဆက္သြယ္ရန္ အေသးစိတ္ မရွိေသးပါ။ အကယ္၍ သင့္ေတာ္သည့္ လိပ္စာရွိပါက ေက်းဇူးျပဳၿပီး ဆက္သြယ္ေပးပါ။" @@ -4897,8 +4958,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "မိမိတို႔၏ privacy ေပၚလစီႏွင့္အညီ သင့္၏ တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ားကို အသုံးျပဳသြားမည္ ျဖစ္ပါသည္။" +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4912,8 +4973,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "ျပင္ဆင္ခဲ့သည့္ အခ်ိန္" @@ -4933,14 +4998,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4963,15 +5024,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "သင့္အေနျဖင့္ ေလးပတ္အတြင္း အျခားေမးခြန္းမ်ား ရရွိလိုၿပီး အေျခအေနကို သတိရေစရန္ သတိေပးလိုပါသလား။" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "မက္ေဆ့ခ်္ တစ္ခုလုံးကို စာလုံးအႀကီးမ်ား ျဖင့္ ေရးျခင္းသည္ ဖတ္ရခက္ခဲၿပီး ပုဒ္ျဖတ္ပုဒ္ရပ္ ကိုလည္း ေပ်ာက္ေစသည္။" -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4980,20 +5045,19 @@ msgstr "မက္ေဆ့ခ်္ တစ္ခုလုံးကို စာ #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "ဟုတ္သည္။" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5001,7 +5065,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ား သို႔မဟုတ္ တူညီသည့္အရာမ်ား ေစာ္ကားခံရအတြက္ ေဖာ္ျပျပႆနာ အစီရင္ခံစာကို ရသည္။" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "သင့္အေနျဖင့္ ေစာ္ကားခံေနရေၾကာင္း ျပန္လည္မြမ္းမံထားသည္ တို႔ကေဖာ္ျပေနၿပီး ထိုထဲတြင္ တစ္ကုိယ္ရည္ အခ်က္အလက္ သို႔မဟုတ္ တူညီသည့္ အခ်က္အလက္မ်ား ပါဝင္သည္။" @@ -5014,7 +5078,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "သင့္အေနျဖင့္ ယခုဆိုက္တြင္ ျပႆနာကို ၾကည့္ရူႏိုင္သည္။" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "သင့္အေနျဖင့္ ယဥ္ေက်းမႈမရွိေသာ သုံးစြဲသူ၏ အီးေမးလ္ကို ၎တို႔ဖန္တီးထားေသာ အလိုအေလ်ာက္ ဖုံးထားေသာ(မေပးပို႔ေသာ) အစီရင္ခံစာမ်ား ျဖစ္သည့္ ယဥ္ေက်းမႈမရွိေသာ စာရင္းတြင္ ထည့္သြင္းထားႏိုင္သည္။" @@ -5022,7 +5086,7 @@ msgstr "သင့္အေနျဖင့္ ယဥ္ေက်းမႈမရ msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5040,15 +5104,15 @@ msgstr "သင့္အေနျဖင့္မည္သည့္ report ကိ msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "သင့္အေနျဖင့္ ကၽြႏု္ပ္တို႔ကို %s အတြက္ ျပည္တြင္း ျပႆနာမ်ားကို အီးေမးလ္ လိပ္စာျဖင့္ ဆက္သြယ္၍ ရွာေဖြႏိုင္ၿပီး %s ရွိ ကၽြႏု္ပ္တို႔ထံသို႔ အီးေမးလ္ ေပးပို႔ႏိုင္သည္။" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "ဆိုက္ေပၚတြင္ ရွိေနမေစခ်င္လွ်င္ ဖ်က္ထားေသာ အဖြဲ႔ကို အမွတ္အသား ျပဳလုပ္ႏိုင္သည္။" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "ျငင္းပယ္လိုက္သည္။ ေက်းဇူးျပဳ၍ အေပၚက အကြက္တြင္ ျဖည့္ေပးပါ။" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5119,7 +5183,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "အစီအရင္ခံစာမ်ား မေပးပို႔မီ (ေကာင္စီမ်ား သို႔မဟုတ္ ႒ာနမ်ားကဲ့သို႔) အဖြဲ႔တခ်ိဳ႔ကို ထည့္သြင္းရန္ လိုအပ္သည္" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5141,9 +5205,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "သင္၏ အီးေမးလ္" @@ -5159,10 +5224,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "သင့္၏အခ်က္အလက္မ်ားကို ကၽြႏု္ပ္တို႔၏ သီးသန္႔တည္ရွိမႈ ေပၚလစီ ႏွင့္အညီ အသုံးျပဳသြားမည္ ျဖစ္သည္။" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "သင့္အမည္" @@ -5178,7 +5243,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5201,7 +5266,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "သင္၏ ဖုန္းနံပါတ္" @@ -5226,7 +5291,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5243,25 +5308,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5295,8 +5359,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "သုံးစြဲသူအား ျပင္ဆင္ျခင္း" @@ -5305,12 +5369,12 @@ msgstr "သုံးစြဲသူအား ျပင္ဆင္ျခင္ msgid "from %s different users" msgstr "%s မွ မတူညီေသာ သုံးစြဲသူမ်ား" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "ေနာက္ဆုံး ျပဳျပင္မြမ္းမံမႈမ်ား" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "တစ္မိနစ္ခန္႔သာ" @@ -5321,7 +5385,7 @@ msgid "n/a" msgstr "မအားေသးပါ" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5361,7 +5425,7 @@ msgstr "နဂိုဝင္ေရာက္ထားမႈ: “%s”" msgid "other areas:" msgstr "အျခား ဧရိယာမ်ား" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5369,7 +5433,7 @@ msgstr "" msgid "sign out" msgstr "ထြက္ရန္" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5386,19 +5450,19 @@ msgstr "အသုံးျပဳသူ မသုံးသည့္ ေျမပ msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "ေဒသတြင္း ျပႆနာသာျဖစ္သည္။" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "ယေန႔" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5414,11 +5478,11 @@ msgstr "အသုံးျပဳသူသည္ တူညီသည့္ ေက msgid "user is problem owner" msgstr "အသုံးျပဳသူပ ျပႆနာပိုင္ရွင္ ျဖစ္သည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5427,31 +5491,31 @@ msgstr "" msgid "ward" msgstr "အုပ္ခ်ဳပ္ေရးဌာန" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d ရက္မ်ား" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d အခ်ိန္မ်ား" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d မိနစ္မ်ား" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5463,13 +5527,13 @@ msgid "%d supporter" msgid_plural "%d supporters" msgstr[0] "%d ေထာက္ပံ့ေပးသူမ်ား" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d ရက္သတၱပတ္မ်ား" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5529,7 +5593,7 @@ msgid "%s update on reports" msgid_plural "%s updates on reports" msgstr[0] "%s ျပဳျပင္မြမ္းမံထားသည့္ အစီရင္ခံစာမ်ား" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5547,7 +5611,7 @@ msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." msgstr[0] "ကၽြႏု္ပ္တို႔သည္ ယခုေနရာကိုႏွင့္ ပတ္သက္သည့္ ေကာင္စီမ်ားအတြက္ အေသးစိတ္မရွိေသးပါ" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 74abc2eaca7..7c5013591c0 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,16 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 -# Jon Harald Søby, 2019 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: Jon Harald Søby, 2019\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/mysociety/teams/12067/nb_NO/)\n" "Language: nb_NO\n" "MIME-Version: 1.0\n" @@ -23,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr " og " -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -37,11 +36,11 @@ msgstr " og " msgid " or " msgstr " eller " -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "ikke mer enn %d tegn" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d redigeringer av %s" @@ -49,7 +48,7 @@ msgstr "%d redigeringer av %s" msgid "%d to %d of %d" msgstr "%d til %d av %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "%d brukere fantes fra før" @@ -159,7 +158,7 @@ msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" msgid "(no longer exists)" msgstr "(eksisterer ikke lenger)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" @@ -168,11 +167,11 @@ msgstr "(ikke rapportert til administrasjonen)" msgid "(optional)" msgstr "(valgfritt)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "(sendt til alle)" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -181,13 +180,13 @@ msgstr "(sendt til begge)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(vi har også RSS-strømmer for problemer innenfor %s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "-- Velg --" @@ -195,8 +194,8 @@ msgstr "-- Velg --" msgid "--Choose a template--" msgstr "--Velg en mal--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -208,11 +207,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "

Rapporter, statistikk og handlinger for

%s

" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr " %s rapporter %s" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%s lagret." @@ -237,11 +236,11 @@ msgstr "Nei La meg bekrefte min oppdatering med e-post" msgid "No Let me confirm my update by email/text" msgstr "Nei La meg bekrefte min oppdatering med e-post/melding" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Merk: Denne rapporten er sendt videre for å få noe til å skje. Ingen endringer sendes videre." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Merk: Denne rapporten har ikke blitt sent videre for handling. Det er ikke sikkert eventuelle endringer vil bli levert." @@ -261,21 +260,21 @@ msgstr "Aktiver totrinns pålogging" msgid "Add" msgstr "Legg til" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "Legg til en administrasjon for hver administrativ instans, for eksempel en kommune eller et departement, der problemrapporter kan sendes. Du kan legge til en eller flere kontaktpunkt (for ulike problemkategorier) for hver administrasjon." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Legg til en kontakt ved å bruke formen under." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Legg til administrasjon" @@ -296,8 +295,8 @@ msgstr "Legg til felt" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Legg til ny kategori" @@ -312,27 +311,27 @@ msgstr "Legg til telefonnummer" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Legg i hurtiglisten" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Legg til bruker" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Legg til / endre problemkategorier" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Legg til / endre responsprioriteter" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Legg til / endre responsmaler" @@ -340,7 +339,7 @@ msgstr "Legg til / endre responsmaler" msgid "Added %s" msgstr "La til %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Ved å legge rapporten i hurtiglisten din vil fjerne den fra hurtiglisten til %s" @@ -369,7 +368,6 @@ msgstr "Send meg varsel ved fremtidige oppdateringer" msgid "Alerts:" msgstr "Varsler:" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -416,11 +414,15 @@ msgstr "Alle rapporter mellom %s og %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "Vi kan alternativt skjule navnet ditt fra alle dine rapporteringer og oppdateringer på nettstedet:" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "Hent alltid alle problemer" @@ -439,9 +441,9 @@ msgid "Anonymous user" msgstr "Anonym bruker" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonym:" @@ -450,29 +452,29 @@ msgstr "Anonym:" msgid "Another user" msgstr "En annen bruker" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Er du sikker på at du vil avbryte opplastingen?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Er du sikker?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Dekket område" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Område:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Da dette er en reproduksjonsside og %s er usann, vil meldinger som blir laget her, bli sendt til problemrapportøren, og ikke til kontakten som er gitt for meldingformålet." @@ -493,11 +495,11 @@ msgstr "Tildel til ekstern administrasjon:" msgid "Assign to subdivision:" msgstr "Tildelt underavdeling:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "Tilordne brukere til områder" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Tildelt %s" @@ -509,8 +511,8 @@ msgstr "På det meste blir %d forespørsler returnert i hver spørring. De retu msgid "At the moment only searching for and looking at reports work." msgstr "For øyeblikket er det kun søk etter og å se på rapporter som fungerer." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "Autorisert personale kan bli assosiert med en kategori hvor de operer." @@ -526,7 +528,7 @@ msgstr "Auto-svar:" msgid "Automated" msgstr "Automatisk" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -547,11 +549,11 @@ msgstr "Unngå personlig informasjon og bilnummerskilt" msgid "Awaiting moderation" msgstr "Avventer moderasjon" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Tilbake" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Tilbake til alle rapporter" @@ -559,10 +561,10 @@ msgstr "Tilbake til alle rapporter" msgid "Ban user" msgstr "Bannlys bruker" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -571,17 +573,17 @@ msgstr "Administrasjoner" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Administrasjon" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Administrasjon:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "CSV-fil" @@ -597,7 +599,7 @@ msgstr "Finner du ikke e-posten? Sjekk mappen for uønsket post. Det løser prob msgid "Can't see the map? Skip this step" msgstr "Hvis du ikke kan se kartet, hopp over dette steget." -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -608,15 +610,15 @@ msgstr "Kategorier" msgid "Categories:" msgstr "Kategorier:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -629,7 +631,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "Kategori og tilstand" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategori endret fra '%s' til '%s'" @@ -639,9 +641,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -668,11 +670,11 @@ msgstr "Bytt passord" msgid "Change phone number" msgstr "Endre telefonnummer" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "Marker trenger inspeksjon hvis rapporter i denne kategorien må inspiseres før de sendes." -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -688,17 +690,17 @@ msgstr "" "Dette passer når du ønsker å tillate brukere å sende inn melding til administrasjonen, men ikke vil vise\n" "den utad. I UK, har de brukt dette for oppgaver som å be om en ekstra papirkurv på et bestemt sted." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Velg et kategorinavn som gir mening for innbyggerne (f.eks. \"Hull i veien\", \"Gatelys\") men som også er nyttig for administrasjonen. Disse vil dukke opp i nedtrekksmenyen på rapporter-et-problem-siden." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "Velg en annen" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "Nullstill lokalt lagrede data" @@ -730,9 +732,13 @@ msgstr "Klikk på lenka i eposten for å logge inn." msgid "Click the map or drag the pin to adjust the location" msgstr "Klikk i kartet eller dra markøren for å tilpasse beliggenheten" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -776,17 +782,17 @@ msgstr "Merkevaresamarbeid:" msgid "Code" msgstr "Kode" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "Minimer kart" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Oppsett" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Bekreft" @@ -807,9 +813,9 @@ msgstr "Bekreft via e-post isteden, ved å oppgi et nytt passord da. Når du bek msgid "Confirmation" msgstr "Bekreftelse" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Bekreftet" @@ -839,7 +845,11 @@ msgstr "Kontakt prosjektgruppen" msgid "Continue" msgstr "Fortsett" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -848,12 +858,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Kunne ikke finne bruker" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Klarte ikke finne posisjon" @@ -861,9 +871,11 @@ msgstr "Klarte ikke finne posisjon" msgid "Council" msgstr "Administrasjon" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Administrasjonskontakter for %s" @@ -892,8 +904,8 @@ msgstr "Lag en rapport" msgid "Create an account" msgstr "Opprett konto" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Lag kategori" @@ -901,15 +913,15 @@ msgstr "Lag kategori" msgid "Create priority" msgstr "Opprett prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "Opprett rapporter/oppdateringer som myndigheten" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "Opprett rapporter/oppdateringer på vegne av en bruker" @@ -923,7 +935,7 @@ msgstr "Lag mal" msgid "Created" msgstr "Opprettet" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "Opprettet %d nye brukere" @@ -946,12 +958,12 @@ msgstr "Gjeldende nøkkel:" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "I øyeblikket er ikke laget noen instanser." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Kunden kan ikke kontaktes" @@ -979,32 +991,32 @@ msgstr "Standard" msgid "Default priority" msgstr "Standard prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "Slett" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Slett mal" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Slettet" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "Beskriv hvorfor du moderer dette" @@ -1020,18 +1032,18 @@ msgstr "Beskrivelse" msgid "Description:" msgstr "Beskrivelse:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "Detaljert informasjon er begrenset til %d tegn." -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detaljer" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1042,7 +1054,7 @@ msgstr "Detaljer:" msgid "Device and Site" msgstr "Enhet og side" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Delegert" @@ -1051,24 +1063,24 @@ msgstr "Delegert" msgid "Didn't use map" msgstr "Brukte ikke kart" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Arbeidshester" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "Slå av" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "Slått av:" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "Forkast endringer" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Ikke send epostvarsel på innhentede kommentarer til den som opprettet problemet" @@ -1077,7 +1089,7 @@ msgstr "Ikke send epostvarsel på innhentede kommentarer til den som opprettet p msgid "Do you have a %s password?" msgstr "Har du et %s-passord?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1085,7 +1097,7 @@ msgstr "" msgid "Don’t know" msgstr "Vet ikke" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Liker ikke skjemaer?" @@ -1093,19 +1105,19 @@ msgstr "Liker ikke skjemaer?" msgid "Down one" msgstr "Én ned" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Dra og slipp bilder hit eller klikk for å laste opp" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "Duplikat av" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "Duplikater" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1116,8 +1128,8 @@ msgstr "" "Ulike kategorier kan ha same kontakt (e-postadresse).\n" "Dette betyr at du kan legge til mange grupper/kategorier selv om du bare har en kontakt for administrasjonen." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "Øst/Nord:" @@ -1125,23 +1137,23 @@ msgstr "Øst/Nord:" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Rediger" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Rediger detaljer for administrasjon" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "Endre andre brukeres rettigheter" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Endre rapportkategori" @@ -1149,15 +1161,15 @@ msgstr "Endre rapportkategori" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Endre rapportprioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Endre rapporter" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1180,28 +1192,28 @@ msgstr "Rediger problem %d" msgid "Editing update %d" msgstr "Redigerer oppdatering %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Redigerer bruker %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Oppdatert av" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-post" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1230,37 +1242,37 @@ msgstr "Send meg en lenke eller kode via epost/SMS for å logge inn" msgid "Email me a link to sign in" msgstr "Send meg ei lenke på epost for å logge inn" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "Epost bekreftet:" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "E-post:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "Slå på" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1268,8 +1280,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1280,8 +1292,8 @@ msgstr "" "oppdateringer til eksisterende rapporter. Hvis du ikke er sikker, skjer det nok ikke, så la den forbli uavkrysset. For mer informasjon, se\n" "denne artikkelen." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1291,8 +1303,8 @@ msgstr "" "et ulikt leveringspunkt (og sendemetode) fra administrasjonenen. For eksempel, hvis noen meldingstyper enten må \n" " e-postes, mens andre kan sendes med Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1300,7 +1312,7 @@ msgstr "" msgid "End Date" msgstr "Sluttdato" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Endepunkt" @@ -1322,10 +1334,6 @@ msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" msgid "Enter a nearby street name and area" msgstr "Skriv inn et veinavn og sted" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" @@ -1339,13 +1347,13 @@ msgstr "Legg inn detaljer om problemet" msgid "Error" msgstr "Feil" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Alt" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Eksempel-postnummer %s" @@ -1357,11 +1365,11 @@ msgstr "Eksempler:" msgid "Existing category" msgstr "Eksisterende kategori" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1378,7 +1386,7 @@ msgstr "" msgid "External ID" msgstr "Ekstern ID" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "Ekstern URL" @@ -1399,25 +1407,25 @@ msgstr "" msgid "External team" msgstr "Eksternt lag" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Ekstra data:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Ekstra detaljer" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1440,11 +1448,12 @@ msgstr "" msgid "Filter report list" msgstr "Filtrer rapportliste" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Første gang" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Fiks dette ved å velge en area covered i Edit body details-skjemaet nedenfor." @@ -1464,9 +1473,9 @@ msgstr "Løst - Administrasjon" msgid "Fixed - User" msgstr "Løst - Bruker" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Merk som slettet" @@ -1474,8 +1483,8 @@ msgstr "Merk som slettet" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Flagget" @@ -1483,7 +1492,7 @@ msgstr "Flagget" msgid "Flagged reports and users" msgstr "Flaggede rapporter og brukere" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Flaggede brukere er listet opp på flaggede-siden." @@ -1492,7 +1501,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Flaggede brukere er ikke begrenset på noe måte. Dette er bare en liste med brukere som har blitt markert for å gi dem oppmerksomhet." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Flagget:" @@ -1508,7 +1517,7 @@ msgstr "Ta med nærbilder og oversiktsbilder for best resultat" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "For mer informasjon, se Hvordan FixMyStreet bruker Mapit." @@ -1522,11 +1531,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Glemt passordet ditt?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Tildelt til ekstern administrasjon" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "Ønsket er sendt videre til ekstern administrasjon" @@ -1542,6 +1551,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Få oppdateringer" @@ -1572,9 +1583,9 @@ msgstr "Glad for å høre at det er i orden!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1584,7 +1595,7 @@ msgstr "Fortsett" msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "Gi tilgang til administratoren" @@ -1592,7 +1603,7 @@ msgstr "Gi tilgang til administratoren" msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1643,11 +1654,11 @@ msgstr "Skjul" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1668,9 +1679,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Skjul nåler" @@ -1687,11 +1698,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Historie" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Hjem" @@ -1699,7 +1710,7 @@ msgstr "Hjem" msgid "How to report a problem" msgstr "Hvordan rapportere et problem" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Hvordan sende inn rapporter som løses" @@ -1721,7 +1732,7 @@ msgstr "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1730,8 +1741,8 @@ msgstr "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1753,13 +1764,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Hvis to eller flere instanser er lokalisert på samme sted, kombinerer FiksGataMi identiske kategorier i en enkelt oppføring i menyen. Kontroller at du bruker samme kategorinavn for instansene, hvis dette er ønskelig." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1771,6 +1782,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Hvis du får mer informasjon om status for problemet ditt, vær så snill å kom tilbake til nettstedet og legg igjen en oppdatering." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Hvis du kun ønsker at denne prioriteten skal være et valg for spesifikke kategorier, velg dem her. Som standard vil de vises for alle kategorier." @@ -1798,34 +1813,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "Hvis du ønsker å legge til en offentlig kommentar på problemet, legg den til her (denne blir ikke sendt til administrasjonen)." -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Hvis du bruker en sendemetode som ikke er e-post, skriv inn tjeneste-ID (Open311) eller ekvivalent identifikator her." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Ugyldig ID" @@ -1833,7 +1848,7 @@ msgstr "Ugyldig ID" msgid "Illegal feed selection" msgstr "Ugyldig valg av feed" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1845,7 +1860,7 @@ msgstr "I misbrukstabell?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "I tillegg er følgende attributter som ikke er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (også returnert som del av description), interface_used, comment_count, requestor_name (kun tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1861,15 +1876,15 @@ msgstr "Inkluder rapportørens personlige detaljer" msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "Trenger inspeksjon" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "Instruer underleverandør til å fikse problemer" @@ -1877,7 +1892,7 @@ msgstr "Instruer underleverandør til å fikse problemer" msgid "Internal notes" msgstr "Interne notater" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1885,12 +1900,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "Ugyldig plassering. Ny plassering må være dekket av den samme administrasjonen." @@ -1911,7 +1926,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1924,8 +1939,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Sist redigert av" @@ -1941,17 +1956,17 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "Minst nylig oppdatert" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "La denne være blank hvis alle rapporter til denne administrasjonen skal sendes ved hjelp av samme sende-metode (dvs. \"%s\")." @@ -1959,7 +1974,7 @@ msgstr "La denne være blank hvis alle rapporter til denne administrasjonen skal msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "List alle rapporterte problemer" @@ -2003,16 +2018,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2020,23 +2035,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "KART" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "Administrer hurtigliste" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Kart" @@ -2044,15 +2059,15 @@ msgstr "Kart" msgid "Mark as sent" msgstr "Marker som sendt" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Merk brukere hvis adferd du ønsker å ha en sjekk på som flagget." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Melding" @@ -2068,19 +2083,19 @@ msgstr "Melding til ekstern administrasjon:" msgid "Missing bodies:" msgstr "Manglende administrasjoner:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Moderer" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "Moderer detaljer i rapprten" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Moderer denne rapporten" @@ -2088,10 +2103,10 @@ msgstr "Moderer denne rapporten" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2109,12 +2124,12 @@ msgstr "" msgid "Month" msgstr "Måned" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Mest kommentert" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2126,11 +2141,11 @@ msgstr "Mest kommentert" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2139,7 +2154,7 @@ msgstr "Navn" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Navn:" @@ -2149,11 +2164,11 @@ msgstr "Navn:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Naviger til dette problemet" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2165,7 +2180,7 @@ msgstr "Nærmeste navngitte vei til nålen plassert på kartet (automatisk gener msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Nærmeste postnummer til nålen plassert på kartet (automatisk generert): %s (%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Nærmeste vei til nålen plassert på kartet (automatisk generert ved hjelp av Bing Maps): %s" @@ -2191,11 +2206,11 @@ msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Ny administrasjon lagt til" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -2231,23 +2246,23 @@ msgstr "" msgid "New priority" msgstr "Ny prioritet" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2255,7 +2270,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Nye problemer for {{COUNCIL}} innenfor {{WARD}} bydel på FiksGataMi" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2291,11 +2306,11 @@ msgstr "Ny tilstand" msgid "New template" msgstr "Ny mal" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Nyeste" @@ -2307,10 +2322,10 @@ msgstr "Neste" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2318,11 +2333,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Nei" @@ -2330,11 +2344,7 @@ msgstr "Nei" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Intet område" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Ingen administrasjon" @@ -2342,7 +2352,7 @@ msgstr "Ingen administrasjon" msgid "No council selected" msgstr "Ingen administrasjon er valgt" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Ingenting endringer har blitt gjort." @@ -2359,11 +2369,11 @@ msgstr "Fant ingen flaggede brukere." msgid "No further updates" msgstr "Ingen flere oppdateringer" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2371,12 +2381,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Ingen resultater returnert" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2396,8 +2406,8 @@ msgstr "Ingen støttespillere" msgid "None" msgstr "Ingen" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." @@ -2405,8 +2415,8 @@ msgstr "" "Vanlige (offentlige) brukere bør ikke være tilknyttet noen områder.
\n" "Autorisert personale kan være assosiert med området de operer i." -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2430,13 +2440,13 @@ msgstr "Ikke rapportert tidligere" msgid "Not reported to council" msgstr "Ikke rapportert til administrasjonen" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Merk" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Merk:" @@ -2460,15 +2470,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2476,16 +2486,16 @@ msgstr "" msgid "Old state" msgstr "Gammel tilstand" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Eldste" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2496,7 +2506,7 @@ msgstr "" msgid "Open" msgstr "Åpen" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "Open311 API-nøkkel" @@ -2504,7 +2514,7 @@ msgstr "Open311 API-nøkkel" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311-API for mySocietys FiksGataMi-tjener" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "Open311 Jurisdiksjon" @@ -2536,17 +2546,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Annet" @@ -2571,8 +2581,8 @@ msgstr "Eier" msgid "Page Not Found" msgstr "Fant ikke siden" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Forelder" @@ -2586,19 +2596,19 @@ msgstr "Delvis" msgid "Password (optional)" msgstr "Passord (valgfritt)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Rettigheter:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2618,17 +2628,16 @@ msgstr "Telefonnummer (valgfritt)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefon:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2639,6 +2648,7 @@ msgstr "Telefon:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2653,7 +2663,7 @@ msgstr "Bilde" msgid "Photo is required." msgstr "Foto er påkrevd." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Foto kreves" @@ -2682,11 +2692,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Plasser tegnestiften på kartet" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Vær høflig, poengtert og kortfattet." @@ -2703,7 +2717,7 @@ msgstr "Vennligst sjekk passordene og prøv igjen" msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2711,11 +2725,11 @@ msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Velg en kategori" @@ -2724,8 +2738,9 @@ msgstr "Velg en kategori" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Husk å rette opp feilene nedenfor." @@ -2744,13 +2759,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Ikke vær ufin — å kjefte på din administrasjon skader verdien av tjenesten for alle brukerne." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Vennligst legg til en melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2758,90 +2773,90 @@ msgstr "Vennligst legg til en melding" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Vennligst skriv et navn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "Vennligst legg inn et navn for administrasjonen" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Skriv inn et passord" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Legg til en gyldig e-post" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Legg inn din e-post" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Vennligst tast inn ditt fornavn" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Vennligst legg inn ditt fulle navn, administrasjoner som mottar ditt problem trenger dette - hvis du ikke ønsker at ditt navn skal vises, fjern haken under" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Legg inn ditt navn" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Legg inn ditt telefonnummer." -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Vennligst tast inn ditt mellomnavn" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Vennligst legg inn din tittel" @@ -2871,7 +2886,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2897,11 +2912,11 @@ msgstr "Merk at din oppdatering enda ikke har blitt sendt." msgid "Please note:" msgstr "Vennligst merk deg:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "Vennligst bidra med en offentlig oppdatering for denne rapporten." @@ -2937,16 +2952,16 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "Vennligst last opp kun bilder" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Skriv inn en melding" @@ -2982,12 +2997,12 @@ msgstr "Drevet av F msgid "Previous" msgstr "Forrige" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "Prioriteter" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "Prioritet" @@ -3001,14 +3016,18 @@ msgstr "Personvern" msgid "Privacy and cookies" msgstr "Personvern og cookies" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privat" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -3031,7 +3050,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -3039,7 +3058,7 @@ msgstr "Problem markert som åpent." msgid "Problem state change based on survey results" msgstr "Problemtilstandsendring basert på spørreundersøkelsesresultater" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemer" @@ -3064,7 +3083,7 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3089,8 +3108,8 @@ msgstr "Problemer innenfor %s, %s" msgid "Property address:" msgstr "Eiendomsadresse:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Bidra med en oppdatering" @@ -3116,7 +3135,7 @@ msgstr "" msgid "Public response:" msgstr "Offentlig respons:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "Offentlig oppdatering:" @@ -3141,6 +3160,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Spørreskjema %d sendt for problem %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" @@ -3164,11 +3184,11 @@ msgstr "RSS-strøm for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm av %s, innenfor %s bydel" @@ -3176,7 +3196,7 @@ msgstr "RSS-strøm av %s, innenfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-strøm med problemer i nærheten" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3196,6 +3216,14 @@ msgstr "RSS-strøm med nylige lokale problemer" msgid "RSS feed of updates to this problem" msgstr "RSS-strøm med oppdateringer for dette problemet" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3215,11 +3243,11 @@ msgstr "Nylige lokale problemer, %s" msgid "Recently reported problems" msgstr "Nylig meldte problemer" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "Nylig oppdatert" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3231,7 +3259,7 @@ msgstr "Husk at FiksGataMi primert er laget for å rapportere fysiske problemer msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3245,9 +3273,9 @@ msgstr "Fjern flagg" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "Fjern fra hurtiglisten" @@ -3273,20 +3301,20 @@ msgstr "Svar til bruker:" msgid "Report" msgstr "Rapport" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "Rapport-ID:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Rapporter et problem" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3296,7 +3324,7 @@ msgstr "" msgid "Report abuse" msgstr "Rapporter misbruk" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3330,17 +3358,18 @@ msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Rapportert tidligere" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -3384,28 +3413,28 @@ msgstr "Rapportert:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Rapporter" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Rapportene begrenses til %s tegn. Rapporten må forkortes." -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3417,7 +3446,7 @@ msgstr "Rapporter som venter på godkjenning" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "Rapporter laget av klarerte brukere vil bli sendt til den ansvarlige administrasjonen uten å bli sjekket først." @@ -3429,15 +3458,15 @@ msgstr "" msgid "Reports published" msgstr "Publiserte rapporter" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3445,11 +3474,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "Usendte rapporter" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "Rapporter vil automatisk bli send uten å måtte sjekkes hvis brukerens omdømme er på eller over denne verdien. Sett den til 0 hvis alle rapporter må sjekkes uansett." -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "Omdømme terskel" @@ -3489,20 +3518,20 @@ msgstr "Responsmaler" msgid "Response Templates for %s" msgstr "Svarmaler for %s" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Riktig sted?" @@ -3514,15 +3543,15 @@ msgstr "Veioperatør for denne navngitte veien (utledet fra veiens referansenumm msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Roter til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3533,23 +3562,23 @@ msgstr "Roter til høyre" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Hvis du roterer dette bildet, mister du ikke lagrede endringer til rapporten." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelitt" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Lagre endringer" @@ -3558,12 +3587,12 @@ msgstr "Lagre endringer" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "Lagre med en offentlig oppdatering" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3573,7 +3602,8 @@ msgstr "" msgid "Search Reports" msgstr "Søk i rapporter" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Søk i brukere" @@ -3582,7 +3612,7 @@ msgid "Search reports" msgstr "Søk i rapporter" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Søk:" @@ -3592,7 +3622,7 @@ msgstr "Søk:" msgid "Searching found no reports." msgstr "Søket fant ingen rapporter." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Søket fant ingen brukere." @@ -3608,17 +3638,18 @@ msgstr "" msgid "See our privacy policy" msgstr "Se personvernreglene våre" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Velg en administrasjon" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Velg et område" @@ -3638,15 +3669,15 @@ msgstr "" msgid "Select:" msgstr "Velg:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3655,7 +3686,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "Rapport sendt tilbake" @@ -3682,7 +3713,7 @@ msgstr "Tjeneste:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "Sett til nåværende plassering" @@ -3691,9 +3722,9 @@ msgid "Share" msgstr "Dele" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "Hurtigliste" @@ -3701,15 +3732,15 @@ msgstr "Hurtigliste" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "I hurtiglisten" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "I hurtiglisten til %s" @@ -3721,7 +3752,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" @@ -3733,21 +3764,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Vis nåler" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3790,8 +3821,8 @@ msgstr "Logg ut" msgid "Some categories may require additional information." msgstr "Noen kategorier krever kanskje mer informasjon" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3809,6 +3840,14 @@ msgstr "Noen bilder av nylig meldte problemer" msgid "Some text to localize" msgstr "Noe tekst å oversette" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Beklager det ser ut til å være et \"Crown dependency\"-postnummer, som vi ikke dekker." @@ -3826,7 +3865,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Beklager, men det oppsto et problem når vi forsøkte å bekrefte problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3848,7 +3887,7 @@ msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt. msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Beklager, vi kunne ikke lagre bildet ditt. Forsøk igjen." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3858,15 +3897,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "Beklager, du mangler rettigheter til å gjøre dette." -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Sorter etter" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "Personale har mulighet til å logge admingrensesnittet." -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "Personale:" @@ -3874,31 +3913,32 @@ msgstr "Personale:" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Tilstand" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3911,14 +3951,14 @@ msgstr "" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3934,7 +3974,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3947,7 +3987,7 @@ msgstr "Gatevisning" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3955,12 +3995,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Underavdeling/administrasjon" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Emne" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Emne:" @@ -3978,7 +4018,7 @@ msgstr "Send inn" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3999,7 +4039,8 @@ msgstr "Sendt inn" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Abonner" @@ -4007,21 +4048,29 @@ msgstr "Abonner" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "Oppsummer problemet" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "Oppsummer dine endringer" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4041,11 +4090,11 @@ msgstr "Oppsummeringsrapporter" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "Superbruker:" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "Superbrukere har tilgang til å utføre alle handlinger i admingrensesnittet." @@ -4063,8 +4112,8 @@ msgstr "" msgid "Template «%s»" msgstr "Mal «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4074,7 +4123,7 @@ msgstr "Maler" msgid "Text" msgstr "Tekst" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Tekst-versjon" @@ -4118,7 +4167,7 @@ msgstr "Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre de msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bildet ser ikke ut til å ha blitt lastet opp riktig (%s), prøv på nytt." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Det stedet dekkes ikke av noen administrasjon, kanskje det er til havs eller utenfor landet - vennligst forsøk et annet sted." @@ -4132,11 +4181,11 @@ msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Det problemer har blitt markert som sendt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." @@ -4148,23 +4197,23 @@ msgstr "Den rapporten kan ikke ses på %s." msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4172,8 +4221,8 @@ msgstr "" "Meldinger om denne kategorien blir sendt til E-postadressen.\n" "For denne administrasjonen kan også andre kategorier ha samme e-postadresse." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4181,15 +4230,15 @@ msgstr "" "Leveringspunktet er nettadressen til den tjenesten FiksGataMi vil koble seg til\n" "for meldinger til denne instansen." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." @@ -4197,10 +4246,10 @@ msgstr "" "Jurisdiksjon er bare nødvendig om leveringspunktet betjener mer \n" "enn en. Hvis administrasjonen har i gang sitt eget leveringspunkt, kan du vanligvis la dette stå tomt." -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4212,8 +4261,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Open311 v2-atributten agency_responsible brukes for å liste opp administrasjonene som mottok problemrapporten, noe som ikke helt stemmer med hvordan atributten er definert i Open311 v2-spesifikasjonen." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4234,12 +4283,12 @@ msgstr "" " vegg), hva det er, hvor lenge det har vært der, en beskrivelse (og et bilde av\n" " problemet hvis du har et), osv." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "The diligency prize league tabellen viser redaktørenes aktivitet, (hvem som har redigert flest)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -4285,7 +4334,7 @@ msgstr "De siste problemer innenfor grensen til {{NAME}} rapportert av brukere" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Denne lenken har kanskje gått ut på tid, eller kanskje du ikke kopierte og limte den inn korrekt." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Listen over tilgjengelige områder kommer fra MapIt-tjenesten på %s." @@ -4306,20 +4355,20 @@ msgstr "Den forespurte URL '%s' ble ikke funnet på denne tjeneren" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt stedet de skrev inn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4333,7 +4382,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Det er ingen rapporter å vise." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4341,8 +4394,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Det var problemer med å vise 'Alle rapporter'-siden. Vennligst prøv igjen senere." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Det var problemer med å vise denne siden. Vennligst prøv igjen senere." @@ -4364,7 +4417,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Det var problemer med din oppdatering. Vær så snill å forsøke igjen." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Det var problemer med din rapport. Vennligst se under." @@ -4381,8 +4434,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4395,7 +4448,7 @@ msgstr "" "For mer informasjon om Open311, se\n" "denne artikkelen." -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4413,7 +4466,7 @@ msgstr "Disse vil bli sent til %s og vil også bli publisert p msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementasjonen er under arbeid og ennå ikke stabil. Den vil endre seg uten advarsel i fremtiden." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4423,12 +4476,12 @@ msgstr "" "Følgelig vil ingen av kategoriene vises i rullegardinkategori-menyen når brukere rapporterer problemer.\n" "For tiden kan ikke brukerne rapportere problemer til denne administrasjonen." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Denne instansen har ingen kontakter. Det betyr at for tiden vil rapporterte problemer til denne instansen ikke bli sendt." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4436,18 +4489,17 @@ msgstr "" "Denne instansen får bare rapporter for problemer som er lokalisert i area covered.\n" "En instans vil ikke få noen meldinger om det ikke dekker minst ett område." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Denne e-posten har blitt sendt til begge administrasjonene som dekker stedet for problemet, da brukeren ikke kategoriserte det. Vær så snill å ignorere den hvis dere ikke er korrekt administrasjon for å håndtere denne saken, eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan legge det til i vårt system." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Denne e-posten har blitt sendt til flere administrasjoner som dekker stedet for problemet, da den valgte kategorien er tilgjengelig for disse. Vær så snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å håndtere denne saken." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Denne informasjonen er påkrevd" @@ -4464,7 +4516,11 @@ msgstr "Dette er et utviklernettsted. Ting kan knekke når som helst og database msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4480,12 +4536,16 @@ msgstr "Dette problemet har ikke blitt løst" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Denne rapporten avventer moderasjon" @@ -4506,7 +4566,7 @@ msgstr "Denne rapporten er for tiden markert som åpen." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren." @@ -4517,7 +4577,7 @@ msgstr "Denne nettsiden inneholder også et bilde av problemet, sendt inn av bru msgid "Time spent (in minutes):" msgstr "Tid brukt (i minutter):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4555,7 +4615,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "For å se et kart med en mer presis plassering for dette problemet." @@ -4584,34 +4644,34 @@ msgstr "" msgid "Total" msgstr "Totalt" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "Trafikkstyring kreves?" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "Klarert av administrasjoner:" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "Klarert til å lage rapporter som ikke må sjekkes" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "Klarert:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Prøv igjen" @@ -4630,16 +4690,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4657,7 +4717,7 @@ msgstr "Ukjent varsel-type" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Ukjent feil" @@ -4670,7 +4730,7 @@ msgstr "Ukjent feil" msgid "Unknown problem ID" msgstr "Ukjent problem-Id" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4683,7 +4743,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Oppdatering" @@ -4692,16 +4752,16 @@ msgstr "Oppdatering" msgid "Update %s created for problem %d; by %s" msgstr "Oppdatering %s opprettet for problem %d, av %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Oppdateringen under lagt inn anonymt %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Oppdateringen under lagt til av %s %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Oppdater administrasjon" @@ -4726,7 +4786,7 @@ msgstr "En oppdatering markerte dette problemet som fikset." msgid "Update reopened problem" msgstr "En oppdatering gjennåpnet problemet" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Oppdater tilstanden" @@ -4744,14 +4804,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Oppdatert!" @@ -4776,12 +4836,12 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, %s" msgstr "Oppdateringer til dette problemet, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4791,15 +4851,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "Bruk dette feltet for å legge inn detaljer som kun blir vist i admingrensesnittet, og ikke blir sendt til administrasjonen." @@ -4808,48 +4868,48 @@ msgstr "Bruk dette feltet for å legge inn detaljer som kun blir vist i admingre msgid "Used map" msgstr "Brukte kart" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Bruker flagget" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Brukersøk leter etter treff gjennom brukernavn og epostadresser. " -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4858,20 +4918,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Brukere" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "Brukere kan gjøre følgende handlinger innenfor deres tildelte administrasjon eller område" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Verdier oppdatert" @@ -4905,12 +4965,12 @@ msgstr "Se rapport per bydel" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Ser på et sted" @@ -4945,7 +5005,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "Vi behøver din epost-adresse, vennligst oppgi den nedenfor." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Vi innser at %s kan være ansvarlig for dette problemet, men vi mangler for tiden kontaktinformasjon for dem. Hvis du vet om en egnet kontaktadresse, så ta kontakt med oss." @@ -4960,8 +5020,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Vi vil kun bruke personlige informasjon om deg i henhold til våre personvernsregler." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4975,8 +5035,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "Vi tar kontakt med deg så snart vi kan." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Når redigert" @@ -4996,14 +5060,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "Oj oj, brems ned! Tre bilder er nok." - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "Hvorfor stoppe der? Sett opp flere varsler gratis." @@ -5024,15 +5084,19 @@ msgstr "Kunne du tenke deg å bidra til FiksGataMi? Kildekoden vår er fri prog msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tenke deg å motta en ny forespørsel om 4 uker, som minner deg om å sjekke status?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Når du skriver meldingen din med kun store bokstaver blir den vanskelig å lese. Det samme gjelder manglende tegnsetting." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5041,20 +5105,19 @@ msgstr "Når du skriver meldingen din med kun store bokstaver blir den vanskelig #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Du klager over at denne problemrapporten ble moderert uten grunn:" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5062,7 +5125,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgende problem er støtende, inneholder personlig informasjon eller lignende:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgende oppdatering er støtende, inneholder personlig informasjon, eller lignende:" @@ -5075,7 +5138,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Du kan lese om problemet på denne siden." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Du kan legge en misbrukers epostadresse til misbrukslista, hvilket automatisk skjuler (og aldri sender) rapporter vedkommende oppretter." @@ -5083,7 +5146,7 @@ msgstr "Du kan legge en misbrukers epostadresse til misbrukslista, hvilket autom msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Du kan kontakte teknisk støtte via %s" @@ -5103,15 +5166,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Du kan hjelpe oss ved å finne en kontakt-e-post for lokale problemer i %s, og sende den via e-post til oss på %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Du kan markere en administrasjon som slettet hvis du ikke vil at den skal være aktiv på dette nettstedet." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Du avviste; vennligst fyll inn boksen ovenfor" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5177,7 +5240,7 @@ msgstr "Du har ikke noen rapporter i hurtiglisten din enda." msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Du må add some bodies (som kommuner eller avdelinger) før rapporten kan bli sendt. " -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5201,9 +5264,10 @@ msgstr "Din konto" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Din e-post" @@ -5219,10 +5283,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Vi vil kun bruke personlig informasjon om deg i henhold til våre personvernsregler." +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Ditt navn" @@ -5238,7 +5302,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5261,7 +5325,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Ditt telefonnummer" @@ -5286,7 +5350,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5303,25 +5367,24 @@ msgstr "" msgid "Yourself" msgstr "Deg" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "alle" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5355,8 +5418,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "rediger bruker" @@ -5365,12 +5428,12 @@ msgstr "rediger bruker" msgid "from %s different users" msgstr "fra %s forskjellige brukere" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "sist oppdatert %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "mindre enn et minutt" @@ -5381,7 +5444,7 @@ msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "ingen" @@ -5421,7 +5484,7 @@ msgstr "opprinnelig lagt inn: “%s”" msgid "other areas:" msgstr "andre områder:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5429,7 +5492,7 @@ msgstr "" msgid "sign out" msgstr "logg ut" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5446,19 +5509,19 @@ msgstr "Det vises ingen nål på grunn av at brukeren ikke brukte kartet" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "denne type lokalt problem" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "idag" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5474,11 +5537,11 @@ msgstr "bruker er fra samme administrasjon som problemet - %d" msgid "user is problem owner" msgstr "bruker er eier av problemet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5487,35 +5550,35 @@ msgstr "" msgid "ward" msgstr "bydel" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dager" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timer" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minutt" msgstr[1] "%d minutter" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5529,14 +5592,14 @@ msgid_plural "%d supporters" msgstr[0] "%d støttespiller" msgstr[1] "%d støttespillere" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d uke" msgstr[1] "%d uker" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5606,7 +5669,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s rapport-
oppdatering" msgstr[1] "%s rapport-
oppdateringer" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5627,7 +5690,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Vi har ennå ikke detaljer for administrasjonen som dekker dette stedet." msgstr[1] "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po index 9320d091491..9c1e84cd755 100644 --- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Dutch (Netherlands) (https://www.transifex.com/mysociety/teams/12067/nl_NL/)\n" "Language: nl_NL\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "en" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "en" msgid " or " msgstr "of" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d bewerkingen door %s" @@ -48,7 +48,7 @@ msgstr "%d bewerkingen door %s" msgid "%d to %d of %d" msgstr "%d aan %d van %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(zoals graffiti, zwerfafval, losliggende tegels of straatverlichting) " msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(niet verstuurd naar de gemeente)" @@ -163,11 +163,11 @@ msgstr "(niet verstuurd naar de gemeente)" msgid "(optional)" msgstr "(optioneel)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(verstuurd naar beide)" @@ -176,13 +176,13 @@ msgstr "(verstuurd naar beide)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Kies een categorie --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "--Kies een website indeling--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -206,11 +206,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -235,11 +235,11 @@ msgstr "Nee Laat me mijn update per e-mail bevestigen" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "N.B: Deze rapportage is verzonden opdat actie wordt ondernomen. Veranderingen worden daarom niet meer meegenomen." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "N.B:Deze rapportage is nog niet verzonden om actie te ondernemen. Veranderingen worden mogelijk niet doorgegeven." @@ -259,8 +259,8 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -269,13 +269,13 @@ msgstr "" "Voeg een Openbaar lichaam (organisatie) toe voor elk bestuursorgaan zoals een gemeenteraad of een gemeentelijke afdeling waaraan de rapporten verzonden kunnen worden.\n" "Je kunt een of meer aanspreekpunten toevoegen (voor verschillende probleemcategoriën) voor elk openbaar lichaam." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Voeg een contactpersoon toe" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Voeg openbaar lichaam toe" @@ -296,8 +296,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Voeg een nieuwe categorie toe" @@ -312,27 +312,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Voeg aan favorieten toe" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Gebruiker toevoegen" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Voeg toe/wijzig categoriën" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Voeg toe/wijzig beantwoordingsprioriteiten" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Voeg toe/wijzig antwoordstramien" @@ -340,7 +340,7 @@ msgstr "Voeg toe/wijzig antwoordstramien" msgid "Added %s" msgstr "%s toegevoegd" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Als dit rapport aan jouw favorieten toevoegd wordt het verwijderd van %s zijn favorieten." @@ -369,7 +369,6 @@ msgstr "Meld het me als er updates zijn" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -416,11 +415,15 @@ msgstr "Alle rapporten tussen %s en %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -439,9 +442,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anoniem:" @@ -450,29 +453,29 @@ msgstr "Anoniem:" msgid "Another user" msgstr "Andere gebruiker" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Weet je zeker dat je de bestandsoverdracht wil afbreken?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Weet je het zeker?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Bestreken gebied" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Gebied:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Dit is een website in opbouw! %s is false. Rapportages op deze site worden doorgegeven aan de rapporteur, niet aan het opgegeven aanspreekpunt." @@ -493,11 +496,11 @@ msgstr "Toegewezen aan:" msgid "Assign to subdivision:" msgstr "Toegewezen aan afdeling:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Toegewezen aan %s" @@ -509,8 +512,8 @@ msgstr "Ten hoogste %d aanvragen worden per query teruggegeven. The teruggegeven msgid "At the moment only searching for and looking at reports work." msgstr "Op dit moment kan je alleen zoeken naar meldingen en deze bekijken." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -526,7 +529,7 @@ msgstr "Automatisch antwoord:" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -547,11 +550,11 @@ msgstr "Zet hier geen persoonlijke informatie of nummerborden van autos neer" msgid "Awaiting moderation" msgstr "Wacht op controle" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Vorige" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Terug naar alle rapportages" @@ -559,10 +562,10 @@ msgstr "Terug naar alle rapportages" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -571,17 +574,17 @@ msgstr "Openbare lichamen" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Openbaar lichaam" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Openbaar lichaam:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -597,7 +600,7 @@ msgstr "Kun je onze email niet vinden? Check je spamfolder. Dat is oplossing in msgid "Can't see the map? Skip this step" msgstr "Kan je de kaart niet zien? Sla deze stap over" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -608,15 +611,15 @@ msgstr "Categoriën" msgid "Categories:" msgstr "Categoriën:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -629,7 +632,7 @@ msgstr "Categorie" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categorie veranderd van '%s' in '%s'" @@ -639,9 +642,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -668,11 +671,11 @@ msgstr "Verander Wachtwoord" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -683,17 +686,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -725,9 +728,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -771,17 +778,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuratie" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Bevestig" @@ -802,9 +809,9 @@ msgstr "" msgid "Confirmation" msgstr "Bevestiging" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Bevestigd" @@ -834,7 +841,11 @@ msgstr "Neem contact op met het team" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -843,12 +854,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Kan de gebruiker niet vinden" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "" @@ -856,9 +867,11 @@ msgstr "" msgid "Council" msgstr "Gemeente" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Gemeente contactpersongen voor %s" @@ -887,8 +900,8 @@ msgstr "Maak een melding" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Maak een categorie" @@ -896,15 +909,15 @@ msgstr "Maak een categorie" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -918,7 +931,7 @@ msgstr "Maak een sjabloon" msgid "Created" msgstr "Aangemaakt" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -941,12 +954,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Klant kan niet bereikt worden" @@ -974,32 +987,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Verwijder sjabloon" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Verwijderd" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1015,18 +1028,18 @@ msgstr "Beschrijving" msgid "Description:" msgstr "Beschrijving:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Details" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1037,7 +1050,7 @@ msgstr "Details:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Overgedragen" @@ -1046,24 +1059,24 @@ msgstr "Overgedragen" msgid "Didn't use map" msgstr "Kaart niet gebruikt" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Toewijdingsranglijst" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Zend bij eventueel commentaar geen email waarschuwingen naar degene die probleem aanmaakte" @@ -1072,7 +1085,7 @@ msgstr "Zend bij eventueel commentaar geen email waarschuwingen naar degene die msgid "Do you have a %s password?" msgstr "Heb je een %s wachtwoord?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1080,7 +1093,7 @@ msgstr "" msgid "Don’t know" msgstr "Geen idee" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Hou je niet van formulieren?" @@ -1088,19 +1101,19 @@ msgstr "Hou je niet van formulieren?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Plaats de fotos hier om ze te verzenden" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1108,8 +1121,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "Oostwaarde/Noordwaarde" @@ -1117,23 +1130,23 @@ msgstr "Oostwaarde/Noordwaarde" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Bewerk" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Wijzig openbaar lichaam details" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1141,15 +1154,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1172,28 +1185,28 @@ msgstr "Bewerk melding %d" msgid "Editing update %d" msgstr "Bewerk update %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Bewerk gebruiker %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Redacteur" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1222,37 +1235,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Email:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1260,8 +1273,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1269,16 +1282,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1286,7 +1299,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1308,10 +1321,6 @@ msgstr "Geef dichtstbijzijnde postcode, of straatnaam en plaats" msgid "Enter a nearby street name and area" msgstr "Geef dichtstbijzijnde straatnaam en plaats" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Geef details van het probleem" @@ -1325,13 +1334,13 @@ msgstr "Geef details van het probleem" msgid "Error" msgstr "Foutmelding" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Voorbeeld van postcode %s" @@ -1343,11 +1352,11 @@ msgstr "Voorbeelden:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1364,7 +1373,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1385,25 +1394,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Extra info:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1426,11 +1435,12 @@ msgstr "" msgid "Filter report list" msgstr "" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Eerste keer" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1450,9 +1460,9 @@ msgstr "Opgelost - Gemeente" msgid "Fixed - User" msgstr "Opgelost - Gebruiker" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "" @@ -1460,8 +1470,8 @@ msgstr "" msgid "Flag user" msgstr "Gemarkeerde gebruikr" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Gemarkeerd" @@ -1469,7 +1479,7 @@ msgstr "Gemarkeerd" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1478,7 +1488,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Gemarkeerd:" @@ -1494,7 +1504,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1508,11 +1518,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Wachtwoord vergeten?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1528,6 +1538,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Updates ontvangen" @@ -1558,9 +1570,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1570,7 +1582,7 @@ msgstr "Gaan" msgid "Going to send questionnaire?" msgstr "Vragenlijst versturen?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1578,7 +1590,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Grafiek van problemen aangemaakt per status na verloop van tijd" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1629,11 +1641,11 @@ msgstr "Verborgen" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1654,9 +1666,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Verberg spelden" @@ -1673,11 +1685,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Geschiedenis" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "" @@ -1685,7 +1697,7 @@ msgstr "" msgid "How to report a problem" msgstr "Hoe een melding maken" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "" @@ -1707,7 +1719,7 @@ msgstr "Ik ben bang dat we je melding niet kunnen vinden in onze database.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1716,8 +1728,8 @@ msgstr "Ik ben bang dat we je melding niet kunnen vinden in onze database.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1739,13 +1751,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1757,6 +1769,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1784,34 +1800,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Illegaal ID" @@ -1819,7 +1835,7 @@ msgstr "Illegaal ID" msgid "Illegal feed selection" msgstr "Illegale RSS feed selectie" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1831,7 +1847,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Daarnaast worden de volgende attributen, die niet onderdeel zijn van de Open311 v2 specificatie meegestuurd: agency_sent_datetime, title (ook meegestuurd als onderdeel van de description), interface_used, comment_count, requestor_name (alleen aanwezig als deze getoond mag worden op de site)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1847,15 +1863,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "Ongeldige has_photo waarde \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1863,7 +1879,7 @@ msgstr "" msgid "Internal notes" msgstr "Interne notities" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1871,12 +1887,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ongeldige agency_responsible waarde %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Ongeldig formaat %s gespecifieerd" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1897,7 +1913,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1910,8 +1926,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Laatste bewerker" @@ -1927,17 +1943,17 @@ msgstr "Laatste update:" msgid "Last update:" msgstr "Laatste update:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1945,7 +1961,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Toon alle meldingen" @@ -1989,16 +2005,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2006,23 +2022,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "Kaart" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Kaart" @@ -2030,15 +2046,15 @@ msgstr "Kaart" msgid "Mark as sent" msgstr "Markeren als verzonden" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Bericht" @@ -2054,19 +2070,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Vermiste jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2074,10 +2090,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2095,12 +2111,12 @@ msgstr "" msgid "Month" msgstr "Maand" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2112,11 +2128,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2125,7 +2141,7 @@ msgstr "Naam" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Naam:" @@ -2135,11 +2151,11 @@ msgstr "Naam:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2151,7 +2167,7 @@ msgstr "Dichtstbijzijnde straat met naam voor lokatie op de kaart (automatisch g msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Dichtstbijzijnde postcode voor lokatie op de kaart (automatisch gegenereerd): %s (%sm afstand)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Dichtstbijzijnde straat voor lokatie op de kaart (automatisch gegenereerd via Bing Maps): %s" @@ -2177,11 +2193,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Nieuw contactpersonen voor categorie toegevoegd" @@ -2217,23 +2233,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2241,7 +2257,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Nieuwe meldingen voor {{COUNCIL}} binnen {{WARD}} wijk op FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2277,11 +2293,11 @@ msgstr "Nieuwe status" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2293,10 +2309,10 @@ msgstr "Volgende" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2304,11 +2320,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Nee" @@ -2316,11 +2331,7 @@ msgstr "Nee" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "" @@ -2328,7 +2339,7 @@ msgstr "" msgid "No council selected" msgstr "Geen gemeente geselecteerd" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Geen bewerkingen gedaan." @@ -2345,11 +2356,11 @@ msgstr "" msgid "No further updates" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2357,12 +2368,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2379,15 +2390,15 @@ msgstr "Geen medestanders" msgid "None" msgstr "Geen" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2407,13 +2418,13 @@ msgstr "Nog niet gemeld" msgid "Not reported to council" msgstr "Niet gemeld bij de gemeente" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Opmerking" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Opmerking:" @@ -2437,15 +2448,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2453,16 +2464,16 @@ msgstr "" msgid "Old state" msgstr "Oude status" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2473,7 +2484,7 @@ msgstr "" msgid "Open" msgstr "Open" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2481,7 +2492,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API voor de mySociety FixMyStreet server" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2513,17 +2524,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Anders" @@ -2548,8 +2559,8 @@ msgstr "Eigenaar" msgid "Page Not Found" msgstr "Pagina Niet Gevonden" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "" @@ -2563,19 +2574,19 @@ msgstr "Gedeeltelijk" msgid "Password (optional)" msgstr "Wachtwoord (optioneel)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2595,17 +2606,16 @@ msgstr "Telefoonnummer (optioneel)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefoonnummer:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2616,6 +2626,7 @@ msgstr "Telefoonnummer:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2630,7 +2641,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2659,11 +2670,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Wees beleefd, precies en beknopt" @@ -2680,7 +2695,7 @@ msgstr "Controleer de wachtwoorden en probeer opnieuw" msgid "Please check your email address is correct" msgstr "Controleer of je e-mailadres klopt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2688,11 +2703,11 @@ msgstr "Controleer of je e-mailadres klopt" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Kies een categorie" @@ -2701,8 +2716,9 @@ msgstr "Kies een categorie" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2718,13 +2734,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Geef bericht in" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2732,90 +2748,90 @@ msgstr "Geef bericht in" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Geef wachtwoord" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Geef onderwerp" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Geef een geldig e-mailadres" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Geef een geldig e-mailadres" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Geef details" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Geef een geldig e-mailadres" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Geef je voornaam" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Geef je volledige naam, gemeentes hebben deze informatie nodig. Mocht je niet willen dat je naam op de site getoond wordt, haal dan de vink beneden weg." -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Geef je naam" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Geef je tweede naam" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Geef je titel" @@ -2843,7 +2859,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Geef aan of je een vragenlijst wilt ontvangen" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2869,11 +2885,11 @@ msgstr "" msgid "Please note:" msgstr "Let op:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2909,16 +2925,16 @@ msgstr "Geef aan of het probleem is verholpen" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Schrijf een bericht" @@ -2954,12 +2970,12 @@ msgstr "" msgid "Previous" msgstr "Vorige" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2973,14 +2989,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privé" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Probleem" @@ -3003,7 +3023,7 @@ msgstr "Probleem %s verzonden naar gemeente %s" msgid "Problem breakdown by state" msgstr "Probleem verdeeld per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Probleem gemarkeerd als open" @@ -3011,7 +3031,7 @@ msgstr "Probleem gemarkeerd als open" msgid "Problem state change based on survey results" msgstr "Probleem status gewijzigd op basis van onderzoeksresultaten" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemen" @@ -3036,7 +3056,7 @@ msgstr "Recent gemelde problemen op FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3061,8 +3081,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Geef een update" @@ -3088,7 +3108,7 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3113,6 +3133,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Vragenlijst %d verzonden voor probleem %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Vragenlijst ingevuld door melder" @@ -3136,11 +3157,11 @@ msgstr "RSS feed voor wijk %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "RSS feed van %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed van %s, binnen wijk %s" @@ -3148,7 +3169,7 @@ msgstr "RSS feed van %s, binnen wijk %s" msgid "RSS feed of nearby problems" msgstr "RSS feed van nabije problemen" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3168,6 +3189,14 @@ msgstr "RSS feed van recente lokale problemen" msgid "RSS feed of updates to this problem" msgstr "RSS feed van updates voor dit probleem" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3187,11 +3216,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Recent gemelde problemen" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3203,7 +3232,7 @@ msgstr "Onthoud dat FixMyStreet zich richt op het melden van fysieke problemen d msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3217,9 +3246,9 @@ msgstr "Verwijder markering" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3245,20 +3274,20 @@ msgstr "Beantwoord" msgid "Report" msgstr "Melding" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Meld een probleem" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3268,7 +3297,7 @@ msgstr "" msgid "Report abuse" msgstr "Meld misbruik" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3302,17 +3331,18 @@ msgid "Report, view, or discuss local problems" msgstr "Meld, bekijk of discussier over lokale problemen" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Anoniem gemeld bij %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Eerder gemeld" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Gemeld door %s bij %s" @@ -3356,28 +3386,28 @@ msgstr "Gemeld:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Meld een probleem" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Meldingen" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3389,7 +3419,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3401,15 +3431,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3417,11 +3447,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3461,20 +3491,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3486,15 +3516,15 @@ msgstr "Wegbeheerder voor deze straat (afgeleid van wegnummer en type): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Wegbeheerder voor deze straat (uit OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Linksom roteren" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3505,23 +3535,23 @@ msgstr "Rechtsom roteren" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Wijzigingen opslaan" @@ -3530,12 +3560,12 @@ msgstr "Wijzigingen opslaan" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3545,7 +3575,8 @@ msgstr "" msgid "Search Reports" msgstr "Zoek Meldingen" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Zoek Gebruikers" @@ -3554,7 +3585,7 @@ msgid "Search reports" msgstr "Meldingen zoeken" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Zoek:" @@ -3564,7 +3595,7 @@ msgstr "Zoek:" msgid "Searching found no reports." msgstr "Geen meldingen gevonden." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Geen gebruikers gevonden." @@ -3580,17 +3611,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Selecteer een gebied" @@ -3610,15 +3642,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3627,7 +3659,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3654,7 +3686,7 @@ msgstr "Service:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3663,9 +3695,9 @@ msgid "Share" msgstr "Deel" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3673,15 +3705,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3693,7 +3725,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Toon mijn naam publiekelijk" @@ -3705,21 +3737,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Toon spelden" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3762,8 +3794,8 @@ msgstr "Uitloggen" msgid "Some categories may require additional information." msgstr "Sommige categorieën hebben extra informatie nodig." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3778,6 +3810,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3795,7 +3835,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3817,7 +3857,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3827,15 +3867,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3843,31 +3883,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Staat" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3880,14 +3921,14 @@ msgstr "" msgid "State:" msgstr "Staat:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3903,7 +3944,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3916,7 +3957,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3924,12 +3965,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Onderwerp" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Onderwerp:" @@ -3947,7 +3988,7 @@ msgstr "Opslaan" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3968,7 +4009,8 @@ msgstr "Opgeslagen" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -3976,21 +4018,29 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4010,11 +4060,11 @@ msgstr "" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4032,8 +4082,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4043,7 +4093,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "" @@ -4087,7 +4137,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4101,11 +4151,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "De postcode is niet geldig." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Het probleem is gemarkeerd als verzonden." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Het probleem wordt opnieuw verzonden." @@ -4117,53 +4167,53 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4173,8 +4223,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4189,12 +4239,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "De foutmelding was: %s" @@ -4240,7 +4290,7 @@ msgstr "Laatste problemen binnen de grenzen van {{NAME}} gemeld door gebruikers" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4261,20 +4311,20 @@ msgstr "De opgevraagde URL '%s' is niet gevonden op de server" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "The gebruiker kon het probleem niet vinden op de kaart, maar het gebied rond de lokatie wordt op de kaart getoond" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4286,7 +4336,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4294,8 +4348,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Er was een probleem bij het tonen van de Alle Meldingen pagina. Probeer het later nog eens." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog eens." @@ -4317,7 +4371,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Er was een probleem met je update. Probeer het later nog eens." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Er was een probleem met je melding. Zie beneden." @@ -4334,8 +4388,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4344,7 +4398,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4362,36 +4416,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Deze API implementatie is een werk in uitvoering en nog niet stabiel. Het kan zonder waarschuwing wijzigen in de toekomst." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïnteresseerd zijn in deze lokatie omdat de gebruiker geen categorie heeft aangegeven. Negeer deze melding als je niet de juiste contactpersoon bent, of laat ons weten in welke categorie dit probleem valt zodat we dit kunnen toevoegen aan ons systeem." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïnteresseerd zijn in deze lokatie. Negeer deze melding als je niet de juiste contactpersoon bent." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Deze informatie is verplicht" @@ -4408,7 +4461,11 @@ msgstr "Dit is een ontwikkelingssite; er kunnen mogelijk problemen optreden, en msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4424,12 +4481,16 @@ msgstr "Dit probleem is niet opgelost" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4450,7 +4511,7 @@ msgstr "Deze melding is momenteel gemarkeerd als openstaand." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Deze pagina bevat een door de gebruiker aangeleverde foto van het probleem." @@ -4461,7 +4522,7 @@ msgstr "Deze pagina bevat een door de gebruiker aangeleverde foto van het proble msgid "Time spent (in minutes):" msgstr "Gespendeerde tijd (in minuten):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tijdslijn" @@ -4499,7 +4560,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4528,34 +4589,34 @@ msgstr "" msgid "Total" msgstr "Totaal" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Opnieuw proberen" @@ -4574,16 +4635,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4601,7 +4662,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "" @@ -4614,7 +4675,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4627,7 +4688,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4636,16 +4697,16 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4670,7 +4731,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4688,14 +4749,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "" @@ -4720,12 +4781,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4735,15 +4796,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4752,48 +4813,48 @@ msgstr "" msgid "Used map" msgstr "Gebruikte kaart" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4802,20 +4863,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Gebruikers" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4849,12 +4910,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4889,7 +4950,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4904,7 +4965,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4919,8 +4980,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "" @@ -4940,14 +5005,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4968,15 +5029,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Je bericht is moeilijk leesbaar als deze alleen uit hoofdletters bestaat of geen interpunctie heeft." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4985,20 +5050,19 @@ msgstr "Je bericht is moeilijk leesbaar als deze alleen uit hoofdletters bestaat #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5006,7 +5070,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Je meld het volgende probleem als beledigend, persoonlijke informatie bevattend of gelijkend aan:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Je meld het volgende update als beledigend, persoonlijke informatie bevattend of gelijkend aan:" @@ -5019,7 +5083,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5027,7 +5091,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5045,15 +5109,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Je kan ons helpen met het vinden van een e-mailadres voor lokale problemen voor %s door deze naar ons te mailen op %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5119,7 +5183,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5141,9 +5205,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Jouw e-mail" @@ -5159,10 +5224,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Je informatie wordt alleen gebruikt zoals vermeld in onze privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Jouw naam" @@ -5178,7 +5243,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5201,7 +5266,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Je telefoonnummer" @@ -5226,7 +5291,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5243,25 +5308,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5295,8 +5359,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5305,12 +5369,12 @@ msgstr "" msgid "from %s different users" msgstr "door %s verschillende gebruikers" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "minder dan een minuut" @@ -5321,7 +5385,7 @@ msgid "n/a" msgstr "n/b" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5361,7 +5425,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5369,7 +5433,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5386,19 +5450,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "vandaag" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5414,11 +5478,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5427,35 +5491,35 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagen" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d uur" msgstr[1] "%d uur" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuut" msgstr[1] "%d minuten" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5469,14 +5533,14 @@ msgid_plural "%d supporters" msgstr[0] "%d voorstander" msgstr[1] "%d voorstanders" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d week" msgstr[1] "%d weken" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5546,7 +5610,7 @@ msgid_plural "%s updates on reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5567,7 +5631,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index d6ae438fb42..4a1ff645992 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Norwegian Nynorsk (Norway) (https://www.transifex.com/mysociety/teams/12067/nn_NO/)\n" "Language: nn_NO\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr " og " -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr " og " msgid " or " msgstr " eller " -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d redigeringar av %s" @@ -48,7 +48,7 @@ msgstr "%d redigeringar av %s" msgid "%d to %d of %d" msgstr "" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" @@ -163,11 +163,11 @@ msgstr "(ikkje rapportert til administrasjonen)" msgid "(optional)" msgstr "(valfritt)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(sendt til begge)" @@ -176,13 +176,13 @@ msgstr "(sendt til begge)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -232,11 +232,11 @@ msgstr "" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "" @@ -291,8 +291,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Legg til ny kategori" @@ -307,27 +307,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -335,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "La til %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "Send meg varsel ved framtidige oppdateringar" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonym:" @@ -445,29 +448,29 @@ msgstr "Anonym:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -488,11 +491,11 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "" @@ -504,8 +507,8 @@ msgstr "På det meste vert %d førespurnader returnert i kvar spørring. Dei ret msgid "At the moment only searching for and looking at reports work." msgstr "For augneblunken går det berre an å søkja etter og å sjå på rapportar." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -554,10 +557,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -592,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "Byt passord" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -678,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -720,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,17 +773,17 @@ msgstr "Merkevaresamarbeid:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Stadfest" @@ -797,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "Stadfesting" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Stadfesta" @@ -829,7 +836,11 @@ msgstr "Kontakt prosjektgruppa" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -838,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "" @@ -851,9 +862,11 @@ msgstr "" msgid "Council" msgstr "Administrasjon" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Administrasjonskontaktar for %s" @@ -882,8 +895,8 @@ msgstr "Lag ein rapport" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Lag kategori" @@ -891,15 +904,15 @@ msgstr "Lag kategori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +926,7 @@ msgstr "" msgid "Created" msgstr "Oppretta" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -936,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -969,32 +982,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Sletta" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1010,18 +1023,18 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1032,7 +1045,7 @@ msgstr "Detaljar:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -1041,24 +1054,24 @@ msgstr "" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Arbeidshestar" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1067,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "Veit ikkje" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1083,19 +1096,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1103,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1112,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Rediger" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1136,15 +1149,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1167,28 +1180,28 @@ msgstr "Rediger problem %d" msgid "Editing update %d" msgstr "Redigerer oppdatering %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Redigerer brukar %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Oppdatert av" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-post" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1217,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "E-post:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1255,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1264,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1281,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1303,10 +1316,6 @@ msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Legg inn detaljar om problemet" @@ -1320,13 +1329,13 @@ msgstr "Legg inn detaljar om problemet" msgid "Error" msgstr "Feil" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Postnummerdøme %s" @@ -1338,11 +1347,11 @@ msgstr "Døme:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1359,7 +1368,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1380,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1421,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Første gong" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1445,9 +1455,9 @@ msgstr "Løyst – Administrasjon" msgid "Fixed - User" msgstr "Løyst – Brukar" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "" @@ -1455,8 +1465,8 @@ msgstr "" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Flagga:" @@ -1464,7 +1474,7 @@ msgstr "Flagga:" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1473,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Flagga:" @@ -1489,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1503,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1523,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "" @@ -1553,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1565,7 +1577,7 @@ msgstr "Hald fram" msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1624,11 +1636,11 @@ msgstr "Skjult" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1649,9 +1661,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Skjul nåler" @@ -1668,11 +1680,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Historie" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "" @@ -1680,7 +1692,7 @@ msgstr "" msgid "How to report a problem" msgstr "Korleis rapportera eit problem" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "" @@ -1702,7 +1714,7 @@ msgstr "Eg er redd vi ikkje klarte å finna problemet ditt i databasen.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1711,8 +1723,8 @@ msgstr "Eg er redd vi ikkje klarte å finna problemet ditt i databasen.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1734,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1752,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1779,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Ugyldig ID" @@ -1814,7 +1830,7 @@ msgstr "Ugyldig ID" msgid "Illegal feed selection" msgstr "Ugyldig val av straum" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1826,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (òg returnert som del av description), interface_used, comment_count, requestor_name (berre tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1842,15 +1858,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi «%s»" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1858,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1866,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1892,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1905,8 +1921,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Sist redigert av" @@ -1922,17 +1938,17 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1940,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Vis alle rapporterte problem" @@ -1984,16 +2000,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2001,23 +2017,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2025,15 +2041,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "" @@ -2049,19 +2065,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2069,10 +2085,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2090,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "Månad" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2107,11 +2123,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2120,7 +2136,7 @@ msgstr "Namn" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Namn:" @@ -2130,11 +2146,11 @@ msgstr "Namn:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2146,7 +2162,7 @@ msgstr "Næraste namngjevne veg til nålen plassert på kartet (automatisk gener msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Næraste postnummer til nålen plassert på kartet (automatisk generert): %s (%sm unna)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av Bing Maps): %s" @@ -2170,11 +2186,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -2210,23 +2226,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2234,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Nye problem for {{COUNCIL}} innanfor {{WARD}} bydel på FiksGataMi" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2270,11 +2286,11 @@ msgstr "Ny tilstand" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2286,10 +2302,10 @@ msgstr "" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2297,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Nei" @@ -2309,11 +2324,7 @@ msgstr "Nei" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "" @@ -2321,7 +2332,7 @@ msgstr "" msgid "No council selected" msgstr "Ingen administrasjon er vald" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Ingen endringar er gjort." @@ -2338,11 +2349,11 @@ msgstr "" msgid "No further updates" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2350,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2372,15 +2383,15 @@ msgstr "" msgid "None" msgstr "Ingen" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2400,13 +2411,13 @@ msgstr "Ikkje rapportert tidlegare" msgid "Not reported to council" msgstr "Ikkje rapportert til administrasjonen" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Merk" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Merk:" @@ -2430,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2446,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "Gammal tilstand" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2466,7 +2477,7 @@ msgstr "" msgid "Open" msgstr "Opne" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2474,7 +2485,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311-API for mySocietys FiksGataMi-tenar" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2506,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Anna" @@ -2541,8 +2552,8 @@ msgstr "Eigar" msgid "Page Not Found" msgstr "Fann ikkje sida" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "" @@ -2556,19 +2567,19 @@ msgstr "Delvis" msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2588,17 +2599,16 @@ msgstr "" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefon:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2609,6 +2619,7 @@ msgstr "Telefon:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2623,7 +2634,7 @@ msgstr "" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2652,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Ver høfleg, poengtert og kortfatta." @@ -2673,7 +2688,7 @@ msgstr "Ver venleg og sjekk passorda og prøv igjen" msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,11 +2696,11 @@ msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Vel ein kategori" @@ -2694,8 +2709,9 @@ msgstr "Vel ein kategori" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2711,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,90 +2741,90 @@ msgstr "Ver venleg og skriv ei melding" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Skriv inn eit passord" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Ver venleg og legg til ein gyldig e-post" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Ver venleg og legg inn namnet ditt" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "" @@ -2838,7 +2854,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2864,11 +2880,11 @@ msgstr "" msgid "Please note:" msgstr "Merk:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2904,16 +2920,16 @@ msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Skriv inn ei melding" @@ -2949,12 +2965,12 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2968,14 +2984,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -2998,7 +3018,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -3006,7 +3026,7 @@ msgstr "Problem markert som ope." msgid "Problem state change based on survey results" msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problem" @@ -3031,7 +3051,7 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3056,8 +3076,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Bidra med ei oppdatering" @@ -3083,7 +3103,7 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3108,6 +3128,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Spørjeskjema %d sendt for problem %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Spørjeskjema fylt inn av feilrapportøren" @@ -3131,11 +3152,11 @@ msgstr "RSS-straum for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "RSS-straum frå %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "RSS-straum av %s, innanfor %s bydel" @@ -3143,7 +3164,7 @@ msgstr "RSS-straum av %s, innanfor %s bydel" msgid "RSS feed of nearby problems" msgstr "RSS-straum med problem i nærleiken" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3163,6 +3184,14 @@ msgstr "RSS-straum med nye lokale problem" msgid "RSS feed of updates to this problem" msgstr "RSS-straum med oppdateringar for dette problemet" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3182,11 +3211,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Nyleg melde problem" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3198,7 +3227,7 @@ msgstr "Hugs at FiksGataMi primert er laga for å rapportera fysiske problem som msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3212,9 +3241,9 @@ msgstr "Fjern flagg" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3240,20 +3269,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Rapporter eit problem" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3263,7 +3292,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3297,17 +3326,18 @@ msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Rapportert tidlegare" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -3351,28 +3381,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3384,7 +3414,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3396,15 +3426,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3412,11 +3442,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3456,20 +3486,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3481,15 +3511,15 @@ msgstr "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3500,23 +3530,23 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Lagra endringar" @@ -3525,12 +3555,12 @@ msgstr "Lagra endringar" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3540,7 +3570,8 @@ msgstr "" msgid "Search Reports" msgstr "Søk i rapportar" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Søk i brukarar" @@ -3549,7 +3580,7 @@ msgid "Search reports" msgstr "" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Søk:" @@ -3559,7 +3590,7 @@ msgstr "Søk:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3575,17 +3606,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "" @@ -3605,15 +3637,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3622,7 +3654,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3649,7 +3681,7 @@ msgstr "Teneste:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3658,9 +3690,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3668,15 +3700,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3688,7 +3720,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" @@ -3700,21 +3732,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Vis nåler" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3757,8 +3789,8 @@ msgstr "Logg ut" msgid "Some categories may require additional information." msgstr "Somme kategoriar krev kanskje meir informasjon" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3773,6 +3805,14 @@ msgstr "Nokre bilete av nyleg melde problem" msgid "Some text to localize" msgstr "Noko tekst å omsetja" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som vi ikkje dekkjer." @@ -3790,7 +3830,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Orsak, men det oppstod eit problem når vi freista å stadfesta problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3812,7 +3852,7 @@ msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv på nytt msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3822,15 +3862,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3838,31 +3878,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Tilstand" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3875,14 +3916,14 @@ msgstr "" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3898,7 +3939,7 @@ msgid "Status" msgstr "" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3911,7 +3952,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3919,12 +3960,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Emne:" @@ -3942,7 +3983,7 @@ msgstr "Send inn" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3963,7 +4004,8 @@ msgstr "" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Abonner" @@ -3971,21 +4013,29 @@ msgstr "Abonner" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4005,11 +4055,11 @@ msgstr "Oppsummeringsrapportar" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4027,8 +4077,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4038,7 +4088,7 @@ msgstr "" msgid "Text" msgstr "Tekst" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Tekst-utgåve" @@ -4085,7 +4135,7 @@ msgstr "Takk, glad for å høyra at problemet er løyst! Vi vil gjerne spørja d msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på nytt." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4099,11 +4149,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." @@ -4115,53 +4165,53 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4171,8 +4221,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Open311 v2-attributten agency_responsible vert brukt for å lista opp administrasjonane som mottok problemrapporten, noko som ikkje heilt passar med korleis attributten er definert i Open311 v2-spesifikasjonen." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4187,12 +4237,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -4238,7 +4288,7 @@ msgstr "Dei siste problema innanfor grensa til {{NAME}} rapportert av brukarar" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4259,20 +4309,20 @@ msgstr "Fann ikkje URL-en «%s» på denne tenaren" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt staden dei skreiv inn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4284,7 +4334,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4292,8 +4346,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv igjen seinare." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4315,7 +4369,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Det var problem med rapporten din. Ver venleg og sjå under." @@ -4332,8 +4386,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4342,7 +4396,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4360,36 +4414,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil endra seg utan åtvaring i framtida." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden for problemet, sidan brukaren ikkje kategoriserte det. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka, eller gjev oss melding om kva for ein kategori av problem dette er så vi kan leggja det til i systemet vårt." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Denne e-posten er sendt til fleire administrasjonar som dekkjer staden for problemet, sidan den valde kategorien er tilgjengeleg for desse. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -4406,7 +4459,11 @@ msgstr "Dette er ein utviklarnettstad. Ting kan knekka når som helst og databas msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4422,12 +4479,16 @@ msgstr "Dette problemet har ikkje vorte løyst" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4448,7 +4509,7 @@ msgstr "Denne rapporten er for tida markert som open." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren." @@ -4459,7 +4520,7 @@ msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukar msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4497,7 +4558,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet" @@ -4526,34 +4587,34 @@ msgstr "" msgid "Total" msgstr "Totalt" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "" @@ -4572,16 +4633,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4599,7 +4660,7 @@ msgstr "Ukjend varsel-type" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "" @@ -4612,7 +4673,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "Ukjend problem-ID" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4625,7 +4686,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4634,16 +4695,16 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "Oppdatering %s oppretta for problem %d, av %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Oppdateringa under vart lagt inn anonymt %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Oppdateringa under vart lagt til av %s %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4668,7 +4729,7 @@ msgstr "Ei oppdatering markerte dette problemet som fiksa." msgid "Update reopened problem" msgstr "Ei oppdatering gjenopna problemet" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Oppdater tilstanden" @@ -4686,14 +4747,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Oppdatert!" @@ -4718,12 +4779,12 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4733,15 +4794,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4750,48 +4811,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Brukar flagga" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4800,20 +4861,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Brukarar" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Verdi oppdatert" @@ -4847,12 +4908,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Ser på ein stad" @@ -4887,7 +4948,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Vi innser at %s kan vera ansvarleg for dette problemet, men vi manglar for tida kontaktinformasjon for dei. Viss du veit om ei eigna kontaktadresse, ta kontakt med oss." @@ -4902,7 +4963,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4917,8 +4978,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Når redigert" @@ -4938,14 +5003,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4966,15 +5027,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Kunne du tenkja deg å motta ein ny førespurnad om 4 veker, som minner deg om å sjekka status?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å lesa. Det same gjeld manglande tegnsetting." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4983,20 +5048,19 @@ msgstr "Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5004,7 +5068,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgjande problem er støytande, inneheld personleg informasjon eller liknande:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du rapporterer at følgjande oppdatering er støytande, inneheld personleg informasjon, eller liknande:" @@ -5017,7 +5081,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5025,7 +5089,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5043,15 +5107,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Du kan hjelpa oss ved å finna ein kontakt-e-post for lokale problem i %s, og senda han via e-post til oss på %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5117,7 +5181,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5139,9 +5203,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5157,10 +5222,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "" @@ -5176,7 +5241,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5199,7 +5264,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "" @@ -5224,7 +5289,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5241,25 +5306,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5293,8 +5357,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5303,12 +5367,12 @@ msgstr "" msgid "from %s different users" msgstr "frå %s ulike brukarar" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "mindre enn eitt minutt" @@ -5319,7 +5383,7 @@ msgid "n/a" msgstr "i/t" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5359,7 +5423,7 @@ msgstr "" msgid "other areas:" msgstr "andre område:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5367,7 +5431,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5384,19 +5448,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "denne typen lokalt problem" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "i dag" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5412,11 +5476,11 @@ msgstr "brukaren er frå same administrasjon som problemet – %d" msgid "user is problem owner" msgstr "brukaren er eigaren av problemet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5425,35 +5489,35 @@ msgstr "" msgid "ward" msgstr "bydel" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5467,14 +5531,14 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5544,7 +5608,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s rapportoppdatering" msgstr[1] "%s rapportoppdateringar" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5565,7 +5629,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Vi har enno ikkje detaljar for administrasjonen som dekkjer denne staden." msgstr[1] "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po index 979c5d67971..67f61ef53ec 100644 --- a/locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pl_PL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Polish (Poland) (https://www.transifex.com/mysociety/teams/12067/pl_PL/)\n" "Language: pl_PL\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "" msgid " or " msgstr "" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "" @@ -48,7 +48,7 @@ msgstr "" msgid "%d to %d of %d" msgstr "" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(taie jak graffiti, śmietniska, uszkodzony bruk czy niedziałające lat msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "" @@ -163,11 +163,11 @@ msgstr "" msgid "(optional)" msgstr "" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "" @@ -176,13 +176,13 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -232,11 +232,11 @@ msgstr "" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "" @@ -291,8 +291,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "" @@ -307,27 +307,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -335,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "" @@ -445,29 +448,29 @@ msgstr "" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -488,11 +491,11 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "" @@ -504,8 +507,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -554,10 +557,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -592,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -678,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -720,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,17 +773,17 @@ msgstr "" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "" @@ -797,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "" @@ -829,7 +836,11 @@ msgstr "" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -838,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "" @@ -851,9 +862,11 @@ msgstr "" msgid "Council" msgstr "" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "" @@ -882,8 +895,8 @@ msgstr "" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "" @@ -891,15 +904,15 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +926,7 @@ msgstr "" msgid "Created" msgstr "" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -936,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -969,32 +982,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1010,18 +1023,18 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1032,7 +1045,7 @@ msgstr "" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -1041,24 +1054,24 @@ msgstr "" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1067,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1083,19 +1096,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1103,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1112,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1136,15 +1149,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1167,28 +1180,28 @@ msgstr "" msgid "Editing update %d" msgstr "" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1217,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1255,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1264,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1281,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1303,10 +1316,6 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "Wpisz nazwę ulicy lub dzielnicy" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Opisz problem" @@ -1320,13 +1329,13 @@ msgstr "Opisz problem" msgid "Error" msgstr "" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "" @@ -1338,11 +1347,11 @@ msgstr "" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1359,7 +1368,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1380,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1421,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1445,9 +1455,9 @@ msgstr "" msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "" @@ -1455,8 +1465,8 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "" @@ -1464,7 +1474,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1473,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "" @@ -1489,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1503,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1523,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "" @@ -1553,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1565,7 +1577,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1624,11 +1636,11 @@ msgstr "" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1649,9 +1661,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "" @@ -1668,11 +1680,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "" @@ -1680,7 +1692,7 @@ msgstr "" msgid "How to report a problem" msgstr "Jak zgłaszać problem" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "" @@ -1702,7 +1714,7 @@ msgstr "" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1711,8 +1723,8 @@ msgstr "" msgid "ID" msgstr "" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1734,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1752,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1779,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "" @@ -1814,7 +1830,7 @@ msgstr "" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1826,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1842,15 +1858,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1858,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1866,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1892,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1905,8 +1921,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "" @@ -1922,17 +1938,17 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1940,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "" @@ -1984,16 +2000,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2001,23 +2017,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2025,15 +2041,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "" @@ -2049,19 +2065,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2069,10 +2085,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2090,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2107,11 +2123,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2120,7 +2136,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "" @@ -2130,11 +2146,11 @@ msgstr "" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2146,7 +2162,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2170,11 +2186,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "" @@ -2210,23 +2226,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2234,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2270,11 +2286,11 @@ msgstr "" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2286,10 +2302,10 @@ msgstr "" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2297,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "" @@ -2309,11 +2324,7 @@ msgstr "" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "" @@ -2321,7 +2332,7 @@ msgstr "" msgid "No council selected" msgstr "" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "" @@ -2338,11 +2349,11 @@ msgstr "" msgid "No further updates" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2350,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2372,15 +2383,15 @@ msgstr "" msgid "None" msgstr "" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2400,13 +2411,13 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "" @@ -2430,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2446,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2466,7 +2477,7 @@ msgstr "" msgid "Open" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2474,7 +2485,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2506,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "" @@ -2541,8 +2552,8 @@ msgstr "" msgid "Page Not Found" msgstr "" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "" @@ -2556,19 +2567,19 @@ msgstr "" msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2588,17 +2599,16 @@ msgstr "" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2609,6 +2619,7 @@ msgstr "" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2623,7 +2634,7 @@ msgstr "" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2652,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" @@ -2673,7 +2688,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,11 +2696,11 @@ msgstr "" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "" @@ -2694,8 +2709,9 @@ msgstr "" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2711,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,90 +2741,90 @@ msgstr "" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "" @@ -2836,7 +2852,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2862,11 +2878,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2902,16 +2918,16 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "" @@ -2947,12 +2963,12 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2966,14 +2982,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2996,7 +3016,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "" @@ -3004,7 +3024,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -3029,7 +3049,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3054,8 +3074,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" @@ -3081,7 +3101,7 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3106,6 +3126,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -3129,11 +3150,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -3141,7 +3162,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3161,6 +3182,14 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3180,11 +3209,11 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3196,7 +3225,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3210,9 +3239,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3238,20 +3267,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3261,7 +3290,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3295,17 +3324,18 @@ msgid "Report, view, or discuss local problems" msgstr "Raportuj, przeglądaj i dyskutuj o lokalnych problemach" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -3349,28 +3379,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3382,7 +3412,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3394,15 +3424,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3410,11 +3440,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3454,20 +3484,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3479,15 +3509,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3498,23 +3528,23 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -3523,12 +3553,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3538,7 +3568,8 @@ msgstr "" msgid "Search Reports" msgstr "" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "" @@ -3547,7 +3578,7 @@ msgid "Search reports" msgstr "" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" @@ -3557,7 +3588,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3573,17 +3604,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "" @@ -3603,15 +3635,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3620,7 +3652,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3647,7 +3679,7 @@ msgstr "" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3656,9 +3688,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3666,15 +3698,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3686,7 +3718,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "" @@ -3698,21 +3730,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3755,8 +3787,8 @@ msgstr "" msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3771,6 +3803,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3788,7 +3828,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3810,7 +3850,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3820,15 +3860,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3836,31 +3876,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3873,14 +3914,14 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3896,7 +3937,7 @@ msgid "Status" msgstr "" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3909,7 +3950,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3917,12 +3958,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" @@ -3940,7 +3981,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3961,7 +4002,8 @@ msgstr "" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -3969,21 +4011,29 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4003,11 +4053,11 @@ msgstr "" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4025,8 +4075,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4036,7 +4086,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "" @@ -4080,7 +4130,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4094,11 +4144,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "" @@ -4110,53 +4160,53 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4166,8 +4216,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4182,12 +4232,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "" @@ -4233,7 +4283,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4254,20 +4304,20 @@ msgstr "" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4279,7 +4329,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4287,8 +4341,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4310,7 +4364,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -4327,8 +4381,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4337,7 +4391,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4355,36 +4409,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4401,7 +4454,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4417,12 +4474,16 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4443,7 +4504,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4454,7 +4515,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4492,7 +4553,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4521,34 +4582,34 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "" @@ -4567,16 +4628,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4594,7 +4655,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "" @@ -4607,7 +4668,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4620,7 +4681,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4629,16 +4690,16 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4663,7 +4724,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4681,14 +4742,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "" @@ -4713,12 +4774,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4728,15 +4789,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4745,48 +4806,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4795,20 +4856,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4842,12 +4903,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4882,7 +4943,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4897,7 +4958,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4912,8 +4973,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "" @@ -4933,14 +4998,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4961,15 +5022,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4978,20 +5043,19 @@ msgstr "" #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -4999,7 +5063,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5012,7 +5076,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5020,7 +5084,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5038,15 +5102,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5112,7 +5176,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5134,9 +5198,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5152,10 +5217,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "" @@ -5171,7 +5236,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5194,7 +5259,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "" @@ -5219,7 +5284,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5236,25 +5301,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5288,8 +5352,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5298,12 +5362,12 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "" @@ -5314,7 +5378,7 @@ msgid "n/a" msgstr "" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5354,7 +5418,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5362,7 +5426,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5379,19 +5443,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5407,11 +5471,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5420,7 +5484,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5429,7 +5493,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5438,7 +5502,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5447,7 +5511,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5456,7 +5520,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5474,7 +5538,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5483,7 +5547,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5573,7 +5637,7 @@ msgstr[1] "%s akutalizacji raportów" msgstr[2] "%s akutalizacji raportów" msgstr[3] "%s akutalizacji raportów" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5600,7 +5664,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po index 9e69a6ff690..ab9fb4c6464 100644 --- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Portuguese (https://www.transifex.com/mysociety/teams/12067/pt/)\n" "Language: pt\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "e" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "e" msgid " or " msgstr "ou" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d edições por %s" @@ -48,7 +48,7 @@ msgstr "%d edições por %s" msgid "%d to %d of %d" msgstr "%d de %d de %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(Como ruas e pavimentos esburacados, grafitis, árvores caídas, lajes p msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(Não reportar ao município)" @@ -163,11 +163,11 @@ msgstr "(Não reportar ao município)" msgid "(optional)" msgstr "(opcional)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(remeter para ambos)" @@ -176,13 +176,13 @@ msgstr "(remeter para ambos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Escolha uma categoria --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -232,11 +232,11 @@ msgstr " Não Deixe-me confirmar a minha atualização por e-m msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Adicionar" @@ -291,8 +291,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Adicionar nova categoria" @@ -307,27 +307,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Adicionar user" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -335,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "Adicionado %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "Avise-me de atualizações futuras" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "Todos os relatórios entre %s e %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonimo:" @@ -445,29 +448,29 @@ msgstr "Anonimo:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Área coberta" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -488,11 +491,11 @@ msgstr "Atribuir ao órgão externo:" msgid "Assign to subdivision:" msgstr "Atribuir a subdivisão:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Designado para %s" @@ -504,8 +507,8 @@ msgstr "No máximo %d pedidos são retornados em cada consulta. Os pedidos retor msgid "At the moment only searching for and looking at reports work." msgstr "Neste momento, apenas procurando e olhando para os relatórios de trabalho." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Aguardando moderação" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Voltar" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -554,10 +557,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "Corpos" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Corpo" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Corpo:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -592,7 +595,7 @@ msgstr "Não recebeu o email de confirmação? Verifique o SPAM da sua caixa de msgid "Can't see the map? Skip this step" msgstr "Não pode ver a localizaçao no mapa Salte esta etapa " -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "Categoria" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "Mudar password" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -678,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -720,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,17 +773,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Confirmar" @@ -797,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "Confirmação" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Confirmado" @@ -829,7 +836,11 @@ msgstr "Fale com a equipe" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -838,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Não foi possível encontrar usuário" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Não olhar para cima da localização" @@ -851,9 +862,11 @@ msgstr "Não olhar para cima da localização" msgid "Council" msgstr "Concelho" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Contactos do município para %s" @@ -882,8 +895,8 @@ msgstr "Criar um report" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Criar uma categoria" @@ -891,15 +904,15 @@ msgstr "Criar uma categoria" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +926,7 @@ msgstr "" msgid "Created" msgstr "Criado" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -936,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -969,32 +982,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Excluidos" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1010,18 +1023,18 @@ msgstr "Descrição detalhada do problema" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "DEtalhes" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1032,7 +1045,7 @@ msgstr "Detalhes:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Delegada" @@ -1041,24 +1054,24 @@ msgstr "Delegada" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Diligency prêmio tabela classificativa" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1067,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "Já tem uma password?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "Não sei" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1083,19 +1096,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1103,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1112,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Editar" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Editar os detalhes do corpo" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1136,15 +1149,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1167,28 +1180,28 @@ msgstr "Editando problema %d" msgid "Editing update %d" msgstr "Editando uma actualizaçao %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Edição de usuário %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Editar" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1217,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Email:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1255,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1264,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1281,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Endpoint" @@ -1303,10 +1316,6 @@ msgstr "Inserir um código postal válido (xxxx-xxx), ou nome da rua, zona ou lo msgid "Enter a nearby street name and area" msgstr "Digite um nome de rua nas proximidades e área" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Escreva de forma detalhada o problema, incluindo uma fotografia" @@ -1320,13 +1329,13 @@ msgstr "Escreva de forma detalhada o problema, incluindo uma fotografia" msgid "Error" msgstr "Erro" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Todos" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Exemplo PostCode %s" @@ -1338,11 +1347,11 @@ msgstr "Exemplos:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1359,7 +1368,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1380,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Dados adicionais:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1421,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "Filtrar relatorio" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Primeiro Nome" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1445,9 +1455,9 @@ msgstr "Corrigido - Concelho" msgid "Fixed - User" msgstr "Corrigido - Usuario" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "" @@ -1455,8 +1465,8 @@ msgstr "" msgid "Flag user" msgstr "Bandeira - Usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Marcado" @@ -1464,7 +1474,7 @@ msgstr "Marcado" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1473,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Marcado:" @@ -1489,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1503,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Não se lembra da sua password?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1523,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Atualizações" @@ -1553,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1565,7 +1577,7 @@ msgstr " Ir" msgid "Going to send questionnaire?" msgstr "Vai enviar questionário?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Status da tabela grafica ao longo do tempo" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1624,11 +1636,11 @@ msgstr "Esconder" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1649,9 +1661,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Ocultar pins" @@ -1668,11 +1680,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "History pins" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Home" @@ -1680,7 +1692,7 @@ msgstr "Home" msgid "How to report a problem" msgstr "Como reportar um problema" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Como enviar relatorios com sucesso" @@ -1702,7 +1714,7 @@ msgstr "Receio que não foi possível localizar o seu problema no banco de dados #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1711,8 +1723,8 @@ msgstr "Receio que não foi possível localizar o seu problema no banco de dados msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1734,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1752,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1779,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID ilegal" @@ -1814,7 +1830,7 @@ msgstr "ID ilegal" msgid "Illegal feed selection" msgstr "Seleção de feed ilegal" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1826,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Além disso, os seguintes atributos que não fazem parte da especificação v2 Open311 são retornados: agency_sent_datetime, título (também retornou como parte da descrição), interface_used, comment_count, requestor_name (presente apenas se solicitante permitido o nome a ser mostrado neste site) ." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1842,15 +1858,15 @@ msgstr "Incluir reports detalhes perssoais" msgid "Incorrect has_photo value \"%s\"" msgstr "Foto_has valor incorreto \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1858,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1866,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Agencia_responsavel valor %s inválido" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Formato inválido%s especificado." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1892,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1905,8 +1921,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Última editor" @@ -1922,17 +1938,17 @@ msgstr "Última atualização:" msgid "Last update:" msgstr "Última atualização:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1940,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Listar todos os problemas relatados" @@ -1984,16 +2000,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2001,23 +2017,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "Mapa" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2025,15 +2041,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Menssagem" @@ -2049,19 +2065,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Falta informaçao jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2069,10 +2085,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2090,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "Mês" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2107,11 +2123,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2120,7 +2136,7 @@ msgstr "Nome" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Nome:" @@ -2130,11 +2146,11 @@ msgstr "Nome:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2146,7 +2162,7 @@ msgstr "Nomeado rodoviário mais próximo ao pino colocado no mapa (gerado autom msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Código postal mais próximo do pino colocado no mapa (gerado automaticamente): %s (%sm distância)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Estrada mais próxima para o pino colocado no mapa (gerado automaticamente por Bing Maps): %s" @@ -2173,11 +2189,11 @@ msgstr "Está quase! Agora basta verificar o seu email…" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Novo corpo adicionado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Novo contato de categoria adicionado" @@ -2213,23 +2229,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2237,7 +2253,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Novos problemas para {{CONCELHO}} {{dentro WARD}} enfermaria em Fix" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2273,11 +2289,11 @@ msgstr "Novo estado" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2289,10 +2305,10 @@ msgstr "Proximo" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2300,11 +2316,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Nao" @@ -2312,11 +2327,7 @@ msgstr "Nao" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Nenhum corpo" @@ -2324,7 +2335,7 @@ msgstr "Nenhum corpo" msgid "No council selected" msgstr "Nenhum Concelho selecionado" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Nenhum ediçao efectuada" @@ -2341,11 +2352,11 @@ msgstr "" msgid "No further updates" msgstr "Sem mais atualizações" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2353,12 +2364,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Nenhum resultado retornado" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2375,15 +2386,15 @@ msgstr "Não apoiantes" msgid "None" msgstr "Nenhum" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2403,13 +2414,13 @@ msgstr "Nao reportado antes" msgid "Not reported to council" msgstr "Nao reportado ao município" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Nota" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Nota" @@ -2433,15 +2444,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2449,16 +2460,16 @@ msgstr "" msgid "Old state" msgstr "Estado antigo" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2469,7 +2480,7 @@ msgstr "" msgid "Open" msgstr "Aberto" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2477,7 +2488,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API para o servidor FixMyStreet mySociety" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2509,17 +2520,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Outro" @@ -2544,8 +2555,8 @@ msgstr "Proprietário" msgid "Page Not Found" msgstr "Pagina nao encontrada" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Parente" @@ -2559,19 +2570,19 @@ msgstr "Parcial" msgid "Password (optional)" msgstr "Password (opcional)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2591,17 +2602,16 @@ msgstr "Telefone (opcional)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefone:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2612,6 +2622,7 @@ msgstr "Telefone:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2626,7 +2637,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2655,11 +2666,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Coloque a fix pin no mapa" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Por favor, seja educado, objectivo, conciso e direto ao ponto." @@ -2676,7 +2691,7 @@ msgstr "Por favor verifique as passwords e tente novamente" msgid "Please check your email address is correct" msgstr "Favor verificar se seu email esta correcto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2684,11 +2699,11 @@ msgstr "Favor verificar se seu email esta correcto" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Escolher uma categoria" @@ -2697,8 +2712,9 @@ msgstr "Escolher uma categoria" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2717,13 +2733,13 @@ msgstr "" "a Equipe POR Trás FixMyStreet, Nao hum Conselho. Pará relatar hum Problema, ⏎\n" " ir par a Página Inicial e como SIGA INSTRUÇÕES." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Por favor insira uma mensagem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2731,90 +2747,90 @@ msgstr "Por favor insira uma mensagem" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Por favor insira uma password" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Por favor insira um assunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Por favor insira um email valido" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Por favor insira um endereço de e-mail válido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Por favor, insira alguns detalhes" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Digite o seu e-mail" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Digite seu primeiro nome" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Por favor, insira o seu nome completo, os conselhos precisam desta informação - se você não quiser que seu nome seja mostrado no site, desmarque a caixa abaixo" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Digite seu nome" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Digite seu segundo nome, apelido" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Por favor, insira o seu título" @@ -2842,7 +2858,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique se você gostaria de receber um outro questionário" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2868,11 +2884,11 @@ msgstr "" msgid "Please note:" msgstr "Favor notar:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2908,16 +2924,16 @@ msgstr "Por favor, indique se o problema foi corrigido" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Por favor, escreva uma mensagem" @@ -2953,12 +2969,12 @@ msgstr "" msgid "Previous" msgstr "Anterior" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2972,14 +2988,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privado" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problema" @@ -3002,7 +3022,7 @@ msgstr "Problema %s enviado ao conselho %s" msgid "Problem breakdown by state" msgstr "Colapso problema por estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problema marcado como aberto." @@ -3010,7 +3030,7 @@ msgstr "Problema marcado como aberto." msgid "Problem state change based on survey results" msgstr "Mudança de estado do problema com base nos resultados da pesquisa" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemas" @@ -3035,7 +3055,7 @@ msgstr "Problemas relatados recentemente fixados em FixMyStreetMindelo" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3060,8 +3080,8 @@ msgstr "" msgid "Property address:" msgstr "Endereço do imóvel:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Fornecer uma atualização" @@ -3087,7 +3107,7 @@ msgstr "" msgid "Public response:" msgstr "Resposta do público:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3112,6 +3132,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Questionário %d enviou para o problema de %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Questionário preenchido por problema repórter" @@ -3135,11 +3156,11 @@ msgstr "RSS feed for %s ala,%s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "RSS feed de %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed de %s, %s problemas pendentes" @@ -3147,7 +3168,7 @@ msgstr "RSS feed de %s, %s problemas pendentes" msgid "RSS feed of nearby problems" msgstr "RSS feed dos problemas próximos" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3167,6 +3188,14 @@ msgstr "RSS feed dos problemas locais recentes" msgid "RSS feed of updates to this problem" msgstr "RSS feed de atualizações para este problema" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3186,11 +3215,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Problemas recentemente reportados" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3202,7 +3231,7 @@ msgstr "Lembre-se que FixMyStreetMIndelo é principalmente para relatar problema msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3216,9 +3245,9 @@ msgstr "Remover bandeira" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3244,20 +3273,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Reportar um problema" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3267,7 +3296,7 @@ msgstr "" msgid "Report abuse" msgstr "Abusivo" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3301,17 +3330,18 @@ msgid "Report, view, or discuss local problems" msgstr "Reportar, ver ou discutir problemas locais" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Relatado anonimamente em %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Relatado antes" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Relatado por %s em %s" @@ -3355,28 +3385,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Relatando um problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Relatórios" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3388,7 +3418,7 @@ msgstr "Relatórios aguardando aprovação" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3400,15 +3430,15 @@ msgstr "" msgid "Reports published" msgstr "Os relatórios publicados" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3416,11 +3446,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3460,20 +3490,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Lugar certo?" @@ -3485,15 +3515,15 @@ msgstr "Operador de estrada por esta estrada chamada (derivado do número de ref msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operador de estrada por esta estrada chamada (a partir de OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Girar para a esquerda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3504,23 +3534,23 @@ msgstr "Girar para a direita" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Salvar alterações" @@ -3529,12 +3559,12 @@ msgstr "Salvar alterações" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3544,7 +3574,8 @@ msgstr "" msgid "Search Reports" msgstr "Busca Reports" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Procurar Usuários" @@ -3553,7 +3584,7 @@ msgid "Search reports" msgstr "elatórios de pesquisa" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Pesquisar:" @@ -3563,7 +3594,7 @@ msgstr "Pesquisar:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3579,17 +3610,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Selecione um corpo" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Selecione uma área" @@ -3609,15 +3641,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3626,7 +3658,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3653,7 +3685,7 @@ msgstr "Srerviço:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3662,9 +3694,9 @@ msgid "Share" msgstr "Acçao" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3672,15 +3704,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3692,7 +3724,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Mostrar meu nome publicamente" @@ -3704,21 +3736,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Mostrar pins" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3761,8 +3793,8 @@ msgstr "Sair " msgid "Some categories may require additional information." msgstr "Algumas categorias podem solicitar informações adicionais." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3777,6 +3809,14 @@ msgstr "Fotos de reports recentes" msgid "Some text to localize" msgstr "Algum informaçao para localizar" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Desculpe, codigo postal nao coincide. Area nao comprrendida." @@ -3794,7 +3834,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Desculpe, houve um erro ao confirmar o seu problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3816,7 +3856,7 @@ msgstr "Desculpe, mas não foi possível analisar esse local. Por favor, tente n msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3826,15 +3866,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3842,31 +3882,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3879,14 +3920,14 @@ msgstr "" msgid "State:" msgstr "Estado" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3902,7 +3943,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3915,7 +3956,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3923,12 +3964,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Zona / Bairro" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Assunto:" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Assunto:" @@ -3946,7 +3987,7 @@ msgstr "Submeter" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3967,7 +4008,8 @@ msgstr "Submitido" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Subscrever" @@ -3975,21 +4017,29 @@ msgstr "Subscrever" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4009,11 +4059,11 @@ msgstr "Resumo reports" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4031,8 +4081,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4042,7 +4092,7 @@ msgstr "" msgid "Text" msgstr "Texto" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Somente versao texto" @@ -4086,7 +4136,7 @@ msgstr "Obrigado, gratos em ouvir que o problema foi corrigido! Podemos apenas p msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Essa imagem não parece ter sido carregada corretamente (%s), por favor, tente novamente." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Esse local não parece ser coberto por um conselho, talvez seja no mar ou fora do país. Por favor, tente novamente." @@ -4100,11 +4150,11 @@ msgstr "Esse local não parece estar em Mindelo, por favor tente novamente." msgid "That postcode was not recognised, sorry." msgstr "Esse código postal não foi reconhecido, me desculpe.Tente novamente." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Esse problema agora será reenviado e reportado ao conselho." @@ -4116,53 +4166,53 @@ msgstr "Esse relatório não pode ser visualizado em %s." msgid "That report has been removed from FixMyStreet." msgstr "Esse relatório foi removido FixMyStreetMIndelo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4172,8 +4222,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "O Open311 v2 atributo agency_responsible é usada para listar as administrações que receberam o relatório de problemas, o que não é muito a forma como o atributo é definido na especificação v2 Open311." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4188,12 +4238,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "O conselho não vai ser capaz de ajudar a menos que você deixe o máximo de detalhes possível. Por favor, descreva a localização exata do problema (por exemplo, em uma parede, passeio, pavimento, iluminaçao), o que é, quanto tempo ele tem estado lá, uma descrição (e uma foto do problema se você tiver um), e outras informaçoes uteis." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "O erro foi: %s" @@ -4239,7 +4289,7 @@ msgstr "Os últimos problemas dentro de {{NAME}} 's fronteira relatados por usu msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4260,20 +4310,20 @@ msgstr " A URL solicitada '%s' não foi encontrada neste servidor" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "O usuário não conseguiu localizar o problema em um mapa, localizar a area mais proxima do local" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4285,7 +4335,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Não existem relatórios a apresentar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4293,8 +4347,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Houve um problema ao mostrar a página de todos os relatórios. Por favor, tente novamente mais tarde." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mais tarde." @@ -4316,7 +4370,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Houve um problema com a sua atualização. Por favor, tente novamente." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Houve problemas com o seu relatório. Por favor, veja abaixo." @@ -4333,8 +4387,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4343,7 +4397,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4361,36 +4415,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Esta implementação API é um trabalho em andamento e ainda não estabilizou. Ela vai mudar sem avisos no futuro." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Este e-mail foi enviado para ambos os conselhos que cobrem o local do problema, como o usuário não categorizá-lo, por favor, ignorar se você não é o conselho correto para lidar com o problema, ou deixe-nos saber que categoria de problema é para que possamos adicioná-lo ao nosso sistema." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Este e-mail foi enviado para vários conselhos que cobrem o local do problema, como a categoria selecionada é fornecida para todos eles, por favor, ignorar se você não é o conselho correto para lidar com o problema." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Esta informação é necessária" @@ -4407,7 +4460,11 @@ msgstr "Este é um site do desenvolvedor, as coisas podem quebrar a qualquer mom msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4423,12 +4480,16 @@ msgstr "Este problema não foi corrigido" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Este relatório está aguardando moderação." @@ -4449,7 +4510,7 @@ msgstr "Este relatório está marcado como aberto." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Esta página também contém uma foto do problema, fornecido pelo usuário." @@ -4460,7 +4521,7 @@ msgstr "Esta página também contém uma foto do problema, fornecido pelo usuár msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Timeline" @@ -4498,7 +4559,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Para ver no mapa a localização exata desse problema" @@ -4527,34 +4588,34 @@ msgstr "" msgid "Total" msgstr "Total" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Tente novamente" @@ -4573,16 +4634,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4600,7 +4661,7 @@ msgstr "Tipo de alerta desconhecido" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Erro desconhecido" @@ -4613,7 +4674,7 @@ msgstr "Erro desconhecido" msgid "Unknown problem ID" msgstr "Desconhecido problema com ID" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4626,7 +4687,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Actualizar" @@ -4635,16 +4696,16 @@ msgstr "Actualizar" msgid "Update %s created for problem %d; by %s" msgstr "Atualize %s criado para o problema de %d; por %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Atualize abaixo colocado de forma anónima em %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Actualizar abaixo adicionado por %s em %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Atualize corpo" @@ -4669,7 +4730,7 @@ msgstr "Atualizaçao do problema marcado como fixo" msgid "Update reopened problem" msgstr "Reaberto a actualizaçao do problema" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Atualizar status" @@ -4687,14 +4748,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Actualizado!" @@ -4719,12 +4780,12 @@ msgstr "Atualizações sobre {{título}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4734,15 +4795,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4751,48 +4812,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Bandeira usuário removida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Usuário sinalizado" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4801,20 +4862,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Usuários" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Valores atualizados" @@ -4848,12 +4909,12 @@ msgstr "Exibir relatórios por Ward" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Visualizando um local" @@ -4888,7 +4949,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Percebemos este problema pode ser da responsabilidade do %s, no entanto, nós não possuímos nenhuma informação de contato deles. Se você souber de um endereço de contato apropriado, favor fornecer esse contacto. Obrigado." @@ -4903,8 +4964,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Nós só usamos as suas informações pessoais de acordo com a nossa política de privacidade." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4918,8 +4979,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Quando editar" @@ -4939,14 +5004,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4967,15 +5028,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Gostaria de receber um questionário em 4 semanas, lembrando que você verifique o status?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Escrever a mensagem inteiramente em letras maiúsculas torna difícil de ler, assim como a falta de pontuação." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4984,20 +5049,19 @@ msgstr "Escrever a mensagem inteiramente em letras maiúsculas torna difícil de #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Sim" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5005,7 +5069,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Você está reportando o seguinte relatório de problema por ser abusiva, contendo informações pessoais, ou similar:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Você está reportando a seguinte atualização por ser abusiva, contendo informações pessoais, ou similar:" @@ -5018,7 +5082,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Você pode ver o problema neste site ." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5026,7 +5090,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5044,15 +5108,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Você pode nos ajudar a encontrar um endereço de e-mail de contato para os problemas locais para %s e e-mail para nós em %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Você recusou, por favor preencha o quadro de cima" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5118,7 +5182,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5140,9 +5204,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "O seu e-mail" @@ -5158,10 +5223,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Suas informações só serão utilizadas de acordo com nossa política de privacidade " +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Nome" @@ -5177,7 +5242,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5200,7 +5265,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Telefone " @@ -5225,7 +5290,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5242,25 +5307,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5294,8 +5358,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5304,12 +5368,12 @@ msgstr "" msgid "from %s different users" msgstr "e %s usuários diferentes" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "Última atualizada %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "menos de um minuto" @@ -5320,7 +5384,7 @@ msgid "n/a" msgstr "n / a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5360,7 +5424,7 @@ msgstr "originalmente introduzido: \"%s\"" msgid "other areas:" msgstr "outras áreas:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5368,7 +5432,7 @@ msgstr "" msgid "sign out" msgstr "sair" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5385,19 +5449,19 @@ msgstr "não há nenhum fix pin para o usuario usar no mapa" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "este tipo de problema local" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "de hoje" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5413,11 +5477,11 @@ msgstr "usuário é da mesmo concelho do problema - %d" msgid "user is problem owner" msgstr "usuário é proprietário problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5426,35 +5490,35 @@ msgstr "" msgid "ward" msgstr "pendente" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5468,14 +5532,14 @@ msgid_plural "%d supporters" msgstr[0] "%d suppoter" msgstr[1] "%d supporters" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5545,7 +5609,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s atualização em relatório" msgstr[1] "%sAtualização dos relatórios" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5566,7 +5630,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Nós ainda não temos detalhes para o conselho, que abrange este local." msgstr[1] "Nós ainda não temos detalhes sobre o concelho, abrangido por este local." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po index acff22bc185..9aba01a251b 100644 --- a/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pt_BR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,16 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 -# Kennet Emerson , 2019 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: Kennet Emerson , 2019\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Portuguese (Brazil) (https://www.transifex.com/mysociety/teams/12067/pt_BR/)\n" "Language: pt_BR\n" "MIME-Version: 1.0\n" @@ -23,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "e" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -37,11 +36,11 @@ msgstr "e" msgid " or " msgstr "ou" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "%d máximo de caracteres" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d edições por %s" @@ -49,7 +48,7 @@ msgstr "%d edições por %s" msgid "%d to %d of %d" msgstr "%d de %d de %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "%d usuários já existem" @@ -161,7 +160,7 @@ msgstr "(como grafite, despejo ilegal, blocos de pavimentação quebrados ou ilu msgid "(no longer exists)" msgstr "(não existe mais)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(não enviado ao conselho)" @@ -170,11 +169,11 @@ msgstr "(não enviado ao conselho)" msgid "(optional)" msgstr "(opcional)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "(enviar para todos)" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(enviar ambos)" @@ -183,13 +182,13 @@ msgstr "(enviar ambos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Escolha uma categoria --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr " -- Escolha uma opção -- " @@ -197,8 +196,8 @@ msgstr " -- Escolha uma opção -- " msgid "--Choose a template--" msgstr "--Escolha um template--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -210,11 +209,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "Denúncias, Estatísticas e Ações para

%s

" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr " %s denúncias %s" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%s salvo." @@ -239,11 +238,11 @@ msgstr "No Deixe-me confirmar a minha atualização por e-mail" msgid "No Let me confirm my update by email/text" msgstr "No Deixe-me confirmar a minha atualização por e-mail" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Nota: Esta denúncia foi enviada para a ação. Quaisquer alterações feitas não serão repassadas." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Nota: Esta denúncia ainda não foi enviado para ação. Quaisquer alterações feitas podem não ser repassadas." @@ -263,8 +262,8 @@ msgstr "Ativar autenticação de duas etapas" msgid "Add" msgstr "Adicionar" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -274,13 +273,13 @@ msgstr "" "para o qual relatórios de problemas podem ser enviados. Você pode adicionar um ou mais contatos (para diferentes\n" " categorias de problemas) a cada corpo." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Adicione um contato usando o formulário abaixo." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Adicionar corpo" @@ -301,8 +300,8 @@ msgstr "Adicionar campo" msgid "Add fixed state" msgstr "Adicionar estado fixo" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Adicionar nova categoria" @@ -317,27 +316,27 @@ msgstr "Adicionar número de telefone" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Adicione para lista" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Adicione usuário" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Adicionar / editar categorias de problemas" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Adicionar / editar prioridades de resposta" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Adicionar / editar modelos de resposta" @@ -345,7 +344,7 @@ msgstr "Adicionar / editar modelos de resposta" msgid "Added %s" msgstr "%s Adicionado" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -374,7 +373,6 @@ msgstr "Alerte me para futuras atualizações" msgid "Alerts:" msgstr "Alertas:" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -421,11 +419,15 @@ msgstr "Todas as denúncias entre %s e %s" msgid "All time" msgstr "Todo o período" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "Como alternativa, podemos ocultar o seu nome de todas as suas denúncias e atualizações no site:" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "Sempre buscar todos os problemas" @@ -444,9 +446,9 @@ msgid "Anonymous user" msgstr "Usuário anônimo" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anônimo:" @@ -455,29 +457,29 @@ msgstr "Anônimo:" msgid "Another user" msgstr "Outro usuário" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Tem certeza de que deseja cancelar este upload?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Você tem certeza?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Área coberta" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Área:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Como este é um site de testes e %s é falso, as denúncias feitas neste site serão enviadas para o relator do problema, não para o contato fornecido na categoria da denúncia." @@ -498,11 +500,11 @@ msgstr "Atribuir a um orgão externo:" msgid "Assign to subdivision:" msgstr "Atribuir a subdivisão:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "Atribuir usuários à áreas" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Atribuído a: %s" @@ -514,8 +516,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -531,7 +533,7 @@ msgstr "Auto-repsosta:" msgid "Automated" msgstr "Automatizado" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "Preencher automaticamente o detalhe/assunto da denúncia" @@ -552,11 +554,11 @@ msgstr "Evite informações pessoais e números de placa de veículos" msgid "Awaiting moderation" msgstr "Aguardando moderação" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Voltar" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Voltar para todas as denúncias" @@ -564,10 +566,10 @@ msgstr "Voltar para todas as denúncias" msgid "Ban user" msgstr "Banir usuário" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -576,17 +578,17 @@ msgstr "Orgãos" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Orgão" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Orgão:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "Arquivo CSV" @@ -602,7 +604,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Não consegue ver o mapa? Pular este passo" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -613,15 +615,15 @@ msgstr "Categorias" msgid "Categories:" msgstr "Categorias:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -634,7 +636,7 @@ msgstr "Categoria" msgid "Category and State" msgstr "Categoria e estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categoria alterada de ‘%s’ para ‘%s’" @@ -644,9 +646,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Taxa de correção para categoria de problemas > 4 semanas " #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -673,11 +675,11 @@ msgstr "Alterar senha" msgid "Change phone number" msgstr "Alterar o número do telefone" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -688,17 +690,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Escolha o nome de uma categoria que faça sentido para o público (por exemplo, \"Buraco na rua\", \"Iluminação pública\") mas que também seja útil para o orgão. Elas aparecerão no menu suspenso da página de denunciar um problema." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "Escolher outro(a)" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "Limpar dados offline" @@ -730,9 +732,13 @@ msgstr "Clique no link do email para entrar." msgid "Click the map or drag the pin to adjust the location" msgstr "Clique no mapa ou arraste o pino para ajustar a localização" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -776,17 +782,17 @@ msgstr "" msgid "Code" msgstr "Código" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "Recolher mapa" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuração" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Confirmar" @@ -807,9 +813,9 @@ msgstr "Confirme por e-mail, fornecendo uma nova senha nesse ponto. Quando você msgid "Confirmation" msgstr "Confirmação" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Confirmado" @@ -839,7 +845,11 @@ msgstr "Contactar o time" msgid "Continue" msgstr "Continuar" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -848,12 +858,12 @@ msgstr "" msgid "Coordinates:" msgstr "Coordenadas:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Não foi possível encontrar o usuário" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Não foi possível encontrar a localização" @@ -861,9 +871,11 @@ msgstr "Não foi possível encontrar a localização" msgid "Council" msgstr "Conselho" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "" @@ -892,8 +904,8 @@ msgstr "Criar uma denúncia" msgid "Create an account" msgstr "Criar uma conta" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Criar uma categoria" @@ -901,15 +913,15 @@ msgstr "Criar uma categoria" msgid "Create priority" msgstr "Criar prioridade" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "Criar denúncias/atualizações como usuário anônimo" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "Criar denúncias/atualizações como o conselho" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -923,7 +935,7 @@ msgstr "Criar template" msgid "Created" msgstr "Criado" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "%d novos usuários criados" @@ -946,12 +958,12 @@ msgstr "Código de acesso atual:" msgid "Currently grouped by %s" msgstr "Atualmente agrupado por %s" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -979,32 +991,32 @@ msgstr "Padrão" msgid "Default priority" msgstr "Prioridade padrão" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "Excluír" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Deletar template" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Deletado" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1020,18 +1032,18 @@ msgstr "Descrição" msgid "Description:" msgstr "Descrição:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detalhes" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1042,7 +1054,7 @@ msgstr "Detalhes:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -1051,24 +1063,24 @@ msgstr "" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "Desabilitar" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "Desabilitado:" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "Descartar mudanças" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1077,7 +1089,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1085,7 +1097,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Não gosta de formulários?" @@ -1093,19 +1105,19 @@ msgstr "Não gosta de formulários?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Arraste e solte as fotos aqui ou clique para enviar" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "Duplicado de" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "Duplicados" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1113,8 +1125,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1122,23 +1134,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Editar" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Editar categoria da denúncia" @@ -1146,15 +1158,15 @@ msgstr "Editar categoria da denúncia" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Editar prioridade da denúncia" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Editar denúncias" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1177,28 +1189,28 @@ msgstr "Editando problema %d" msgid "Editing update %d" msgstr "" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Editando usuário %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Editor" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1227,37 +1239,37 @@ msgstr "Me envie um email ou um código por mensagem de texto para entrar" msgid "Email me a link to sign in" msgstr "Me envie um email para entrar" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "Email verificado:" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Email:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "Habilitar" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1265,8 +1277,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1274,16 +1286,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1291,7 +1303,7 @@ msgstr "" msgid "End Date" msgstr "Data Final" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1313,10 +1325,6 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "Digite um nome de rua e área próximas" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "Digite uma rua, área ou ponto de referência" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Digite detalhes do problema" @@ -1330,13 +1338,13 @@ msgstr "Digite detalhes do problema" msgid "Error" msgstr "Erro" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Tudo" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "CEP exemplo %s" @@ -1348,11 +1356,11 @@ msgstr "Exemplos:" msgid "Existing category" msgstr "Categoria existente" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "Usuários existentes não serão modificados." -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "Expandir mapa" @@ -1369,7 +1377,7 @@ msgstr "Exportar como CSV" msgid "External ID" msgstr "ID Externo" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "URL Externa" @@ -1390,25 +1398,25 @@ msgstr "" msgid "External team" msgstr "Time externo" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "Campos Extras" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Detalhes extras" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "Campos externos:" @@ -1431,11 +1439,12 @@ msgstr "Preencha seus detalhes manualmente" msgid "Filter report list" msgstr "Filtrar lista de denúncias" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Primeira vez" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1455,9 +1464,9 @@ msgstr "" msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Marcar como deletado" @@ -1465,8 +1474,8 @@ msgstr "Marcar como deletado" msgid "Flag user" msgstr "Marcar usuário" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "" @@ -1474,7 +1483,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1483,7 +1492,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Marcado:" @@ -1499,7 +1508,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1513,11 +1522,11 @@ msgstr "Esqueceu a senha" msgid "Forgotten your password?" msgstr "Esqueceu sua senha?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Encaminhado ao orgão externo" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1533,6 +1542,8 @@ msgstr "Gerar token" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Receber atualizações" @@ -1563,9 +1574,9 @@ msgstr "Ficamos felizes em saber que foi solucionado!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1575,7 +1586,7 @@ msgstr "Ir" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "Garantir acesso ao administrador" @@ -1583,7 +1594,7 @@ msgstr "Garantir acesso ao administrador" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "Agrupar" @@ -1634,11 +1645,11 @@ msgstr "Escondido" msgid "Hidden Field" msgstr "Campo Escondido" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "Esconder todas as denúncias e atualizações" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "Esconder toda a denúncia" @@ -1659,9 +1670,9 @@ msgstr "Esconda meu nome nesta atualização" msgid "Hide my name on this report" msgstr "Esconder meu nome nesta denúncia" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Esconder pinos" @@ -1678,11 +1689,11 @@ msgstr "Esconder seu nome?" msgid "Hint" msgstr "Dica" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Histórico" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Início" @@ -1690,7 +1701,7 @@ msgstr "Início" msgid "How to report a problem" msgstr "Como denunciar um problema" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Como enviar denúncias com sucesso" @@ -1712,7 +1723,7 @@ msgstr "" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1721,8 +1732,8 @@ msgstr "" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1744,13 +1755,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "Se você está nos contatando sobre uma denúncia ou atualização específica, por favor inclua o link para a denúncia na mensagem." @@ -1762,6 +1773,10 @@ msgstr "Se você gerou um novo código de acesso, o código antigo não funciona msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Se você conseguir mais alguma informação sobre o estado do seu problema, por favor volte e nos forneça uma atualização." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Se você deseja que esta prioridade seja uma opção para categorias específicas, escolha elas aqui. Por padrão ela será mostrada para todas as categorias." @@ -1789,34 +1804,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID Ilegal" @@ -1824,7 +1839,7 @@ msgstr "ID Ilegal" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "Importar usuários" @@ -1836,7 +1851,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "Inativo" @@ -1852,15 +1867,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "Inspecionar denúncia" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "Inspeção requerida" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1868,7 +1883,7 @@ msgstr "" msgid "Internal notes" msgstr "Notas internas" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "Falha na Internet" @@ -1876,12 +1891,12 @@ msgstr "Falha na Internet" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1902,7 +1917,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "
" @@ -1915,8 +1930,8 @@ msgstr "" msgid "Last 7 days" msgstr "Últimos 7 dias" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Último editor" @@ -1932,17 +1947,17 @@ msgstr "Última atualização:" msgid "Last update:" msgstr "" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "Latitude/Longitude:" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1950,7 +1965,7 @@ msgstr "" msgid "List" msgstr "Lista" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Listar todas os problemas denunciados" @@ -1994,16 +2009,16 @@ msgstr "Entrar com o Facebook" msgid "Log in with Twitter" msgstr "Entrar com o Twitter" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Entrar com o email" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "Entrar com email/sms" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "Sair de todas as sessões" @@ -2011,23 +2026,23 @@ msgstr "Sair de todas as sessões" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "Ordem manual" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Mapa" @@ -2035,15 +2050,15 @@ msgstr "Mapa" msgid "Mark as sent" msgstr "Marcar como enviado" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Mensagem" @@ -2059,19 +2074,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Moderado" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Moderar esta denúncia" @@ -2079,10 +2094,10 @@ msgstr "Moderar esta denúncia" msgid "Moderate this update" msgstr "Moderar esta atualização" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "Moderado por %s às %s" @@ -2100,12 +2115,12 @@ msgstr "" msgid "Month" msgstr "Mês" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Mais comentados" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2117,11 +2132,11 @@ msgstr "Mais comentados" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2130,7 +2145,7 @@ msgstr "Nome" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Nome:" @@ -2140,11 +2155,11 @@ msgstr "Nome:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Navegar para este problema" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2156,7 +2171,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2180,11 +2195,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Novo orgão adicionado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "" @@ -2220,23 +2235,23 @@ msgstr "Novo número de telefone:" msgid "New priority" msgstr "Nova prioridade" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "Novos problemas para %s" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "Novos problemas para %s" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "Novos problemas para área de id %s" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2244,7 +2259,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2280,11 +2295,11 @@ msgstr "Novo estado" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Mais novo" @@ -2296,10 +2311,10 @@ msgstr "Próximo" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2307,11 +2322,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Não" @@ -2319,11 +2333,7 @@ msgstr "Não" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Sem área" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Nenhum orgão" @@ -2331,7 +2341,7 @@ msgstr "Nenhum orgão" msgid "No council selected" msgstr "Nenhum concelho selecionado" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Nenhuma edição feita ate agora." @@ -2348,11 +2358,11 @@ msgstr "" msgid "No further updates" msgstr "Nenhuma atualização adicional" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2360,12 +2370,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Nenhum resultado retornado" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2382,15 +2392,15 @@ msgstr "Sem apoiadores" msgid "None" msgstr "Nada" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2410,13 +2420,13 @@ msgstr "Não denunciado antes" msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "" @@ -2440,15 +2450,15 @@ msgstr "Número de problemas denunciados em cada categoria, nos últimos 7 dias. msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "Dado offline limpo" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2456,16 +2466,16 @@ msgstr "" msgid "Old state" msgstr "" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Mais antigo" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2476,7 +2486,7 @@ msgstr "" msgid "Open" msgstr "Abrir" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2484,7 +2494,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2516,17 +2526,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Outro" @@ -2551,8 +2561,8 @@ msgstr "Dono" msgid "Page Not Found" msgstr "Página Não Encontrada" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "" @@ -2566,19 +2576,19 @@ msgstr "" msgid "Password (optional)" msgstr "Senha (opcional)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Permissões:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2598,17 +2608,16 @@ msgstr "Número de telefone (opcional)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "Telefone verificado:" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefone:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2619,6 +2628,7 @@ msgstr "Telefone:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2633,7 +2643,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "Foto é requerida." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Foto requerida" @@ -2662,11 +2672,15 @@ msgstr "Escolha seu concelho:" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Coloque o pino no mapa" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" @@ -2683,7 +2697,7 @@ msgstr "Por favor, verifique a senha e tente novamente" msgid "Please check your email address is correct" msgstr "Por favor, verifique se seu email está correto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2691,11 +2705,11 @@ msgstr "Por favor, verifique se seu email está correto" msgid "Please check your phone number is correct" msgstr "Por favor, verifique se seu telefone está correto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Por favor escolha uma categoria" @@ -2704,8 +2718,9 @@ msgstr "Por favor escolha uma categoria" msgid "Please choose a less commonly-used password" msgstr "Por favor, escolha uma senha menos comum" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Por favor, corrija os erros abaixo" @@ -2721,13 +2736,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Por favor, especifique uma mensagem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2735,90 +2750,90 @@ msgstr "Por favor, especifique uma mensagem" msgid "Please enter a mobile number" msgstr "Por favor, digite um número de telefone" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Por favor, digite um nome" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "Por favor, digite um nome para este orgão" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Por favor, especifique uma senha" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Por favor, digite um assunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Por favor, especifique um email válido" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Por favor, digite um endereço de email válido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "Por favor, digite um email válido ou número de telefone" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Por favor, especifique alguns detalhes" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Por favor, especifique seu email" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Por favor, digite seu primeiro nome" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Por favor, digite seu nome" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Por favor, digite seu número de telefone" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Por favor, especifique seu segundo nome" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Por favor, digite seu título" @@ -2846,7 +2861,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique se você gostaria de receber outro questionário" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "Por favor, certifique-se que sua senha tem pelo menos %d caracteres" @@ -2872,11 +2887,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "Por favor, forneça uma atualização pública para esta denúncia." @@ -2912,16 +2927,16 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "Por favor, envie apenas uma imagem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "Por favor, confirme pelo menos um dos e-mail/telefone" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Por favor, digite uma mensagem" @@ -2957,12 +2972,12 @@ msgstr "" msgid "Previous" msgstr "Anterior" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "Prioridades" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "Prioridade" @@ -2976,14 +2991,18 @@ msgstr "Privacidade" msgid "Privacy and cookies" msgstr "Cookies e Privacidade" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privado" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problema" @@ -3006,7 +3025,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problema marcado como aberto" @@ -3014,7 +3033,7 @@ msgstr "Problema marcado como aberto" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemas" @@ -3039,7 +3058,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3064,8 +3083,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Forneça uma atualização" @@ -3091,7 +3110,7 @@ msgstr "Detalhes públicos" msgid "Public response:" msgstr "Resposta pública:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "Atualização pública:" @@ -3116,6 +3135,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Questionário preenchido pelo relator do problema " @@ -3139,11 +3159,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -3151,7 +3171,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3171,6 +3191,14 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3190,11 +3218,11 @@ msgstr "Problemas locais recentes, %s" msgid "Recently reported problems" msgstr "Problemas denunciados recentemente" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "Atualizados recentemente" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "Rejeitar denúncia" @@ -3206,7 +3234,7 @@ msgstr "" msgid "Remove" msgstr "Remover" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "Remover detalhes da conta" @@ -3220,9 +3248,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3248,20 +3276,20 @@ msgstr "Responder ao usuário:" msgid "Report" msgstr "Denunciar" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "ID da Denúnciia" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Denunciar um problema" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "Denunciar um problema aqui" @@ -3271,7 +3299,7 @@ msgstr "Denunciar um problema aqui" msgid "Report abuse" msgstr "Denunciar abuso" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3305,17 +3333,18 @@ msgid "Report, view, or discuss local problems" msgstr "Denuncie, veja ou discuta problemas locais" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Denunciado anonimamente às %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Denunciado antes" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Denunciado por %s às %s" @@ -3359,28 +3388,28 @@ msgstr "Denunciado:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Denunciando um problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Denúncias" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3392,7 +3421,7 @@ msgstr "Denúncias aguardando aprovação" msgid "Reports by destination" msgstr "Denúncias por destino" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3404,15 +3433,15 @@ msgstr "" msgid "Reports published" msgstr "Denúncias publicadas" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "Denúncias enviadas para %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3420,11 +3449,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "Denúncias aguardando para serem enviadas" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3464,20 +3493,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "Reverter para o original" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "Reverter para o texto original" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "Reverter para o título original" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Lugar certo?" @@ -3489,15 +3518,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Girar Para a Esquerda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3508,23 +3537,23 @@ msgstr "Girar Para a Direita" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satélite" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "Salvar + fechar como duplicado" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Salvar mudanças" @@ -3533,12 +3562,12 @@ msgstr "Salvar mudanças" msgid "Save new fields" msgstr "Salvar novos campos" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3548,7 +3577,8 @@ msgstr "" msgid "Search Reports" msgstr "Buscar Denúncias" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Buscar Usuários" @@ -3557,7 +3587,7 @@ msgid "Search reports" msgstr "Buscar denúncias" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Buscar:" @@ -3567,7 +3597,7 @@ msgstr "Buscar:" msgid "Searching found no reports." msgstr "A busca não encontrou nenhuma denúncia." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "A busca não encontrou nenhum usuário." @@ -3583,17 +3613,18 @@ msgstr "Segurança" msgid "See our privacy policy" msgstr "Veja nossa poítica de privacidade" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Selecionar um orgão" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Selecionar uma área" @@ -3613,15 +3644,15 @@ msgstr "" msgid "Select:" msgstr "Selecionar:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "Enviar" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "Enviar email de login" @@ -3630,7 +3661,7 @@ msgstr "Enviar email de login" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3657,7 +3688,7 @@ msgstr "Serviço:" msgid "Set password" msgstr "Definir senha" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "Definir para minha localização atual" @@ -3666,9 +3697,9 @@ msgid "Share" msgstr "Compartilhar" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3676,15 +3707,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3696,7 +3727,7 @@ msgstr "Mostrar Foto?" msgid "Show all updates" msgstr "Mostrar todas as atualizações" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Mostrar meu nome publicamente" @@ -3708,21 +3739,21 @@ msgstr "Mostrar nome publicamente?" msgid "Show older" msgstr "Mostrar antigo" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "Mostrar denúncias antigas" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "Mostrar foto" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3765,8 +3796,8 @@ msgstr "Sair" msgid "Some categories may require additional information." msgstr "Algumas categorias podem requerer informação adicional" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3781,6 +3812,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3798,7 +3837,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Desculpe, houve um erro ao confirmar seu problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3820,7 +3859,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Desculpe, não conseguimos salvar sua(s) imagem(ns), por favor tente novamente." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3830,15 +3869,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "Desculpe, você não tem permissão para fazer isto." -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Ordenar por" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3846,31 +3885,32 @@ msgstr "" msgid "Start Date" msgstr "Data Início" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3883,14 +3923,14 @@ msgstr "" msgid "State:" msgstr "Estado:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "Estados" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3906,7 +3946,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3919,7 +3959,7 @@ msgstr "Visão da Rua" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "Subcategoria" @@ -3927,12 +3967,12 @@ msgstr "Subcategoria" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Assunto" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Assunto:" @@ -3950,7 +3990,7 @@ msgstr "Enviar" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3971,7 +4011,8 @@ msgstr "Enviado" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -3979,21 +4020,29 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4013,11 +4062,11 @@ msgstr "" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "Superusuário:" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4035,8 +4084,8 @@ msgstr "Nos conte sobre você" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4046,7 +4095,7 @@ msgstr "" msgid "Text" msgstr "Texto" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Versão de texto" @@ -4090,7 +4139,7 @@ msgstr "Obrigado, ficamos felizes em saber que foi corrigido! Poderíamos apenas msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Esta imagem parece não ter sido enviada corretamente (%s), por favor tente novamente." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4104,11 +4153,11 @@ msgstr "Esse local não parece ser no Brasil; Por favor, tente novamente." msgid "That postcode was not recognised, sorry." msgstr "O CEP não foi encontrado, desculpe." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "O problema foi marcado como enviado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Este problema será reenviado." @@ -4120,23 +4169,23 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "Este usuário deslogou." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4144,31 +4193,31 @@ msgstr "" "O endereço de e-mail é o destino para o qual as denúncias desta categoria serão enviados.\n" "Outras categorias para este orgão podem ter o mesmo endereço de e-mail." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4178,8 +4227,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4194,12 +4243,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "O erro foi: %s" @@ -4245,7 +4294,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4266,20 +4315,20 @@ msgstr "O endereço '%s' não foi encontrado neste servidor" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4291,7 +4340,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Não há denúncias para mostrar." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4299,8 +4352,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Houve um problema ao tentar mostrar a página de Todos as Denúncias. Por favor tente novamente mais tarde." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Houve um problema ao tentar mostrar esta página. Por favor tente novamente mais tarde." @@ -4322,7 +4375,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Houve um problema com sua atualização. Por favor tente novamente." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Houveram problemas com o sua denúncia. Por favor veja abaixo." @@ -4339,8 +4392,8 @@ msgstr "Estes detalhes serão enviados ao conselho, mas nunca serão mostrados o msgid "These details will never be shown online without your permission." msgstr "Estes detalhes nunca serão mostrados online sem sua permissão." -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4349,7 +4402,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "Estes usuários não foram atualizados." @@ -4367,36 +4420,35 @@ msgstr "Estas informações serão enviadas à %s e também ser msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Este orgão não possui informações de contato. Isto significa que os problemas denúnciados para este orgão não serão enviados." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Este email foi enviado para diversos conselhos que cobrem a área do problema, de acordo com a categoria selecionada e fornecida por todos eles; por favor ignore este email se você não é o conselho correto para lidar com este problema." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Esta informação é necessária" @@ -4413,7 +4465,11 @@ msgstr "Este é um site de desenvolvedor; as coisas podem quebrar a qualquer mom msgid "This is the public text that will be shown on the site." msgstr "Este é o texto público que será mostrado no site." -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "Esta página é uma forma rápida de criar muitos usuários para administrar de uma vez só." @@ -4429,12 +4485,16 @@ msgstr "Este problema não foi solucionado" msgid "This problem is still ongoing" msgstr "Esse problema ainda está em andamento" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "Esta denúncia está duplicada. Por favor, deixe atualizações na denúncia original:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Esta denúncia está aguardando moderação." @@ -4455,7 +4515,7 @@ msgstr "Esta denúncia está atualmente marcada como aberta." msgid "This report is now closed to updates." msgstr "Esta denúncia está fechada para atualizações." -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4466,7 +4526,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "Tempo gasto (em minutos):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Linha do tempo" @@ -4504,7 +4564,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4533,34 +4593,34 @@ msgstr "" msgid "Total" msgstr "Total" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Tente novamente" @@ -4579,16 +4639,16 @@ msgstr "A autenticação de duas etapas foi desativada" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "Tipo" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "Desbanir" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4606,7 +4666,7 @@ msgstr "Tipo de alerta desconhecido" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Erro desconhecido" @@ -4619,7 +4679,7 @@ msgstr "Erro desconhecido" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4632,7 +4692,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Atualização" @@ -4641,16 +4701,16 @@ msgstr "Atualização" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4675,7 +4735,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4693,14 +4753,14 @@ msgstr "Atualizado por %s (%s) em %s" msgid "Updated by %s at %s" msgstr "Atualizado por %s em %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Atualizado!" @@ -4725,12 +4785,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "Notas de uso" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4740,15 +4800,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4757,48 +4817,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "Usuário já existe" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "Usuário na tabela de abuso" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4807,20 +4867,20 @@ msgstr "" msgid "User:" msgstr "Usuário:" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Usuários" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Valores atualizados" @@ -4854,12 +4914,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4894,7 +4954,7 @@ msgstr "Enviamos um código de confirmação para seu telefone. Por favor digite msgid "We need your email address, please give it below." msgstr "Nós precisamos do seu endereço de email, por favor, especifique-o abaixo" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4909,7 +4969,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4924,8 +4984,12 @@ msgstr "Website" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "" @@ -4945,14 +5009,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "Quais problemas você gostaria de receber alertas?" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4973,15 +5033,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Você gostaria de receber outro questionário em 4 semanas, te lembrando de chegar o status?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Escrever toda sua mensagem em maiúsculas dificulta a leitura, assim como a falta de pontuação." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4990,20 +5054,19 @@ msgstr "Escrever toda sua mensagem em maiúsculas dificulta a leitura, assim com #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Sim" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "Você está offline" @@ -5011,7 +5074,7 @@ msgstr "Você está offline" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Você está denunciando este problema por ser abusivo, conter informação pessoal, ou algo similar:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Você está denunciando esta atualização por ser abusiva, conter informação pessoal, ou algo similar:" @@ -5024,7 +5087,7 @@ msgstr "Você pode criar uma nova denúncia na mesma localizaçã msgid "You can view the problem on this site." msgstr "Você pode ver o problema no site." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5032,7 +5095,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Você pode contatar suporte técnico em %s" @@ -5050,15 +5113,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Você recusou; por favor preencha a caixa acima" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5124,7 +5187,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5146,9 +5209,10 @@ msgstr "Sua conta" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Seu email" @@ -5164,10 +5228,10 @@ msgid "Your email or mobile" msgstr "Seu email ou telefone" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Sua informação apenas será usada de acordo com nossa política de privacidade" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Seu nome" @@ -5183,7 +5247,7 @@ msgstr "Seu nome foi ocultado de todas as suas denúncias e atualizações." msgid "Your name has been hidden." msgstr "Seu nome foi ocultado" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "Suas denúncias offline" @@ -5206,7 +5270,7 @@ msgid "Your password should include %d or more characters." msgstr "Sua senha deve ter %d ou mais caracteres. " #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Seu número de telefone" @@ -5231,7 +5295,7 @@ msgstr "Seu token foi gerado" msgid "Your update" msgstr "Sua atualização" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5248,25 +5312,24 @@ msgstr "Seu código de verificação é %s" msgid "Yourself" msgstr "Você mesmo" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "administrador" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "tudo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "um administrador" @@ -5300,8 +5363,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "editar usuário" @@ -5310,12 +5373,12 @@ msgstr "editar usuário" msgid "from %s different users" msgstr "de %s usuários diferentes" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "última atualização %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "menos de um minuto" @@ -5326,7 +5389,7 @@ msgid "n/a" msgstr "n/d" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "nada" @@ -5366,7 +5429,7 @@ msgstr "" msgid "other areas:" msgstr "outras áreas:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "mostrar" @@ -5374,7 +5437,7 @@ msgstr "mostrar" msgid "sign out" msgstr "sair" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5391,19 +5454,19 @@ msgstr "" msgid "this location" msgstr "esta localização" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "hoje" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "atualização" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "atualizações" @@ -5419,11 +5482,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "usuário fora da lista de abuso" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "usuário removido da lista de abuso" @@ -5432,35 +5495,35 @@ msgstr "usuário removido da lista de abuso" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "%d endereço" msgstr[1] "%d endereços" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dia" msgstr[1] "%d dias" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d hora" msgstr[1] "%d horas" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuto" msgstr[1] "%d minutos" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5474,14 +5537,14 @@ msgid_plural "%d supporters" msgstr[0] "%d apoiador" msgstr[1] "%d apoiadores" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d semana" msgstr[1] "%d semanas" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5551,7 +5614,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s atualização nas denúncias" msgstr[1] "%s atualizações nas denúncias" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5572,7 +5635,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po index 7e3e295e004..68fb2859032 100644 --- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Romanian (Romania) (https://www.transifex.com/mysociety/teams/12067/ro_RO/)\n" "Language: ro_RO\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "şi" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "şi" msgid " or " msgstr "sau" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d modificări de %s" @@ -48,7 +48,7 @@ msgstr "%d modificări de %s" msgid "%d to %d of %d" msgstr "%d - %d din %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(cum ar fi graffiti, gunoaie depozitate ilegal, pavaj spart sau iluminat msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(netrimis)" @@ -163,11 +163,11 @@ msgstr "(netrimis)" msgid "(optional)" msgstr "(opțional)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "" @@ -176,13 +176,13 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Alege o categorie --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -203,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -232,11 +232,11 @@ msgstr "" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -256,21 +256,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "" @@ -291,8 +291,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Adaugă o categorie nouă" @@ -307,27 +307,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Adaugă utilizator" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -335,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -364,7 +364,6 @@ msgstr "" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -411,11 +410,15 @@ msgstr "" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -434,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "" @@ -445,29 +448,29 @@ msgstr "" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -488,11 +491,11 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "" @@ -504,8 +507,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -521,7 +524,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -542,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -554,10 +557,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -566,17 +569,17 @@ msgstr "" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -592,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -603,15 +606,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -624,7 +627,7 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -634,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -663,11 +666,11 @@ msgstr "" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -678,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -720,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -766,17 +773,17 @@ msgstr "" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "" @@ -797,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "" @@ -829,7 +836,11 @@ msgstr "" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -838,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "" @@ -851,9 +862,11 @@ msgstr "" msgid "Council" msgstr "" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "" @@ -882,8 +895,8 @@ msgstr "" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "" @@ -891,15 +904,15 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -913,7 +926,7 @@ msgstr "" msgid "Created" msgstr "" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -936,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -969,32 +982,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1010,18 +1023,18 @@ msgstr "" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1032,7 +1045,7 @@ msgstr "" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -1041,24 +1054,24 @@ msgstr "" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1067,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1075,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1083,19 +1096,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1103,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1112,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1136,15 +1149,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1167,28 +1180,28 @@ msgstr "" msgid "Editing update %d" msgstr "" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1217,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1255,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1264,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1281,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1303,10 +1316,6 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "" @@ -1320,13 +1329,13 @@ msgstr "" msgid "Error" msgstr "" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "" @@ -1338,11 +1347,11 @@ msgstr "" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1359,7 +1368,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "" @@ -1380,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1421,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1445,9 +1455,9 @@ msgstr "" msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "" @@ -1455,8 +1465,8 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "" @@ -1464,7 +1474,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1473,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "" @@ -1489,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1503,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1523,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "" @@ -1553,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1565,7 +1577,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1573,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1624,11 +1636,11 @@ msgstr "" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1649,9 +1661,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "" @@ -1668,11 +1680,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "" @@ -1680,7 +1692,7 @@ msgstr "" msgid "How to report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "" @@ -1702,7 +1714,7 @@ msgstr "" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1711,8 +1723,8 @@ msgstr "" msgid "ID" msgstr "" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1734,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1752,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1779,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "" @@ -1814,7 +1830,7 @@ msgstr "" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1826,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1842,15 +1858,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1858,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1866,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1892,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1905,8 +1921,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "" @@ -1922,17 +1938,17 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1940,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "" @@ -1984,16 +2000,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2001,23 +2017,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2025,15 +2041,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "" @@ -2049,19 +2065,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2069,10 +2085,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2090,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2107,11 +2123,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2120,7 +2136,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "" @@ -2130,11 +2146,11 @@ msgstr "" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2146,7 +2162,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2170,11 +2186,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "" @@ -2210,23 +2226,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2234,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2270,11 +2286,11 @@ msgstr "" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2286,10 +2302,10 @@ msgstr "" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2297,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "" @@ -2309,11 +2324,7 @@ msgstr "" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "" @@ -2321,7 +2332,7 @@ msgstr "" msgid "No council selected" msgstr "" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "" @@ -2338,11 +2349,11 @@ msgstr "" msgid "No further updates" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2350,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2372,15 +2383,15 @@ msgstr "" msgid "None" msgstr "" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2400,13 +2411,13 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "" @@ -2430,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2446,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2466,7 +2477,7 @@ msgstr "" msgid "Open" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2474,7 +2485,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2506,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "" @@ -2541,8 +2552,8 @@ msgstr "" msgid "Page Not Found" msgstr "" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "" @@ -2556,19 +2567,19 @@ msgstr "" msgid "Password (optional)" msgstr "" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2588,17 +2599,16 @@ msgstr "" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2609,6 +2619,7 @@ msgstr "" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2623,7 +2634,7 @@ msgstr "" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2652,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" @@ -2673,7 +2688,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2681,11 +2696,11 @@ msgstr "" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "" @@ -2694,8 +2709,9 @@ msgstr "" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2711,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2725,90 +2741,90 @@ msgstr "" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "" @@ -2836,7 +2852,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2862,11 +2878,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2902,16 +2918,16 @@ msgstr "" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "" @@ -2947,12 +2963,12 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2966,14 +2982,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2996,7 +3016,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "" @@ -3004,7 +3024,7 @@ msgstr "" msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -3029,7 +3049,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3054,8 +3074,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" @@ -3081,7 +3101,7 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3106,6 +3126,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "" @@ -3129,11 +3150,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -3141,7 +3162,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3161,6 +3182,14 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3180,11 +3209,11 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3196,7 +3225,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3210,9 +3239,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3238,20 +3267,20 @@ msgstr "" msgid "Report" msgstr "" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3261,7 +3290,7 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3295,17 +3324,18 @@ msgid "Report, view, or discuss local problems" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -3349,28 +3379,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3382,7 +3412,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3394,15 +3424,15 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3410,11 +3440,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3454,20 +3484,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "" @@ -3479,15 +3509,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3498,23 +3528,23 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -3523,12 +3553,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3538,7 +3568,8 @@ msgstr "" msgid "Search Reports" msgstr "" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "" @@ -3547,7 +3578,7 @@ msgid "Search reports" msgstr "" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "" @@ -3557,7 +3588,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "" @@ -3573,17 +3604,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "" @@ -3603,15 +3635,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3620,7 +3652,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3647,7 +3679,7 @@ msgstr "" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3656,9 +3688,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3666,15 +3698,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3686,7 +3718,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "" @@ -3698,21 +3730,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3755,8 +3787,8 @@ msgstr "" msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3771,6 +3803,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3788,7 +3828,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3810,7 +3850,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3820,15 +3860,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3836,31 +3876,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3873,14 +3914,14 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3896,7 +3937,7 @@ msgid "Status" msgstr "" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3909,7 +3950,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3917,12 +3958,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "" @@ -3940,7 +3981,7 @@ msgstr "" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3961,7 +4002,8 @@ msgstr "" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -3969,21 +4011,29 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4003,11 +4053,11 @@ msgstr "" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4025,8 +4075,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4036,7 +4086,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "" @@ -4080,7 +4130,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4094,11 +4144,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "" @@ -4110,53 +4160,53 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4166,8 +4216,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4182,12 +4232,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "" @@ -4233,7 +4283,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4254,20 +4304,20 @@ msgstr "" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4279,7 +4329,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4287,8 +4341,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "" @@ -4310,7 +4364,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -4327,8 +4381,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4337,7 +4391,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4355,36 +4409,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" @@ -4401,7 +4454,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4417,12 +4474,16 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4443,7 +4504,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4454,7 +4515,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4492,7 +4553,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4521,34 +4582,34 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "" @@ -4567,16 +4628,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4594,7 +4655,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "" @@ -4607,7 +4668,7 @@ msgstr "" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4620,7 +4681,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4629,16 +4690,16 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4663,7 +4724,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4681,14 +4742,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "" @@ -4713,12 +4774,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4728,15 +4789,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4745,48 +4806,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4795,20 +4856,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4842,12 +4903,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "" @@ -4882,7 +4943,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4897,7 +4958,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4912,8 +4973,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "" @@ -4933,14 +4998,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4961,15 +5022,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4978,20 +5043,19 @@ msgstr "" #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -4999,7 +5063,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5012,7 +5076,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5020,7 +5084,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5038,15 +5102,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5112,7 +5176,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5134,9 +5198,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5152,10 +5217,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "" @@ -5171,7 +5236,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5194,7 +5259,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "" @@ -5219,7 +5284,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5236,25 +5301,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5288,8 +5352,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5298,12 +5362,12 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "mai puţin de un minut" @@ -5314,7 +5378,7 @@ msgid "n/a" msgstr "indisponibil" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5354,7 +5418,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5362,7 +5426,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5379,19 +5443,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5407,11 +5471,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5420,7 +5484,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5428,7 +5492,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5436,7 +5500,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5444,7 +5508,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5452,7 +5516,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5468,7 +5532,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5476,7 +5540,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5556,7 +5620,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5580,7 +5644,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po index 1db22ca3c28..4bba2ce1edc 100644 --- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Russian (https://www.transifex.com/mysociety/teams/12067/ru/)\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "и" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "и" msgid " or " msgstr "или" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d правок от %s" @@ -48,7 +48,7 @@ msgstr "%d правок от %s" msgid "%d to %d of %d" msgstr "%d по %d из %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "пользователей уже зарегистрировано" @@ -160,7 +160,7 @@ msgstr "(например: граффити, мусор в неположенн msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(не отправлено в органы самоуправления)" @@ -169,11 +169,11 @@ msgstr "(не отправлено в органы самоуправления) msgid "(optional)" msgstr "(необязательно)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(отправлено в обе инстанции)" @@ -182,13 +182,13 @@ msgstr "(отправлено в обе инстанции)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Выберите категорию --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -196,8 +196,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -212,11 +212,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -241,11 +241,11 @@ msgstr "Нет Я хочу подтвердить обновл msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -265,8 +265,8 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -276,13 +276,13 @@ msgstr "" " в ведении которой находится решение подобных вопросов. В информацию о каждом учреждении можно добавить\n" " один или несколько контактов (в зависимости от вида неполадки)." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Добавить контакт с помощью формы." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Добавить учреждение" @@ -303,8 +303,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Добавить категорию" @@ -319,27 +319,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Добавить пользователя" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -347,7 +347,7 @@ msgstr "" msgid "Added %s" msgstr "Добавлено: %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -376,7 +376,6 @@ msgstr "Оповещать меня об обновлениях в будуще msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -423,11 +422,15 @@ msgstr "Все отчеты с %s по %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -446,9 +449,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Анонимно:" @@ -457,29 +460,29 @@ msgstr "Анонимно:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Зона покрытия" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Поскольку это отладочный сайт и в параметре %s значение False, все обращения, оставленные на сайте, будут отправлены их авторам, а не в учреждения, обозначенные в категориях." @@ -500,11 +503,11 @@ msgstr "Направить во внешнее учреждение:" msgid "Assign to subdivision:" msgstr "Направить в подразделение:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Направлено сюда: %s" @@ -516,8 +519,8 @@ msgstr "Как правило, количество результатов, ко msgid "At the moment only searching for and looking at reports work." msgstr "Сейчас можно только искать и просматривать обращения" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -533,7 +536,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -554,11 +557,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Ожидает модерации" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Назад" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -566,10 +569,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -578,17 +581,17 @@ msgstr "Учреждения" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Учреждение" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Учреждение:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -604,7 +607,7 @@ msgstr "Письмо не пришло? Оно могло попасть в па msgid "Can't see the map? Skip this step" msgstr "Карта не отображается? Пропустите этот шаг" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -615,15 +618,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -636,7 +639,7 @@ msgstr "Категория" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -646,9 +649,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Процент устранения неполадок в этой категории, которым больше 4 недель" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -675,11 +678,11 @@ msgstr "Сменить пароль" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -697,7 +700,7 @@ msgstr "" " имеют публичной ценности. Например: просьба обеспечить жителей определенного дома \n" " дополнительным мусорным баком." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -705,11 +708,11 @@ msgstr "" "Выберите название категории которое будет понятно не только другим пользователям (например, «Выбоина» или «Уличное освещение»), но и \n" " сотрудникам учреждения. Варианты названий отобразятся в раскрывающемся меню на странице подачи обращений." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -741,9 +744,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -787,17 +794,17 @@ msgstr "Кобренд:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфигурация" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Подтвердить" @@ -818,9 +825,9 @@ msgstr "" msgid "Confirmation" msgstr "Подтверждение" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Подтверждено" @@ -850,7 +857,11 @@ msgstr "Свяжитесь с командой" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -859,12 +870,12 @@ msgstr "" msgid "Coordinates:" msgstr "Координаты:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Не удалось найти пользователя" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Не удалось найти местоположение" @@ -872,9 +883,11 @@ msgstr "Не удалось найти местоположение" msgid "Council" msgstr "Орган самоуправления" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Контакты органа самоуправления для %s" @@ -903,8 +916,8 @@ msgstr "Создать обращение" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Создать категорию" @@ -912,15 +925,15 @@ msgstr "Создать категорию" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -934,7 +947,7 @@ msgstr "Создать шаблон" msgid "Created" msgstr "Создано" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -957,12 +970,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "В данный момент на сайте не зарегистрировано ни одного учреждения." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Невозможно связаться с покупателем" @@ -990,32 +1003,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Удалить шаблон" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Удалено" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1031,18 +1044,18 @@ msgstr "Описание" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Дополнительная информация" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1053,7 +1066,7 @@ msgstr "Дополнительная информация:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Передано" @@ -1062,24 +1075,24 @@ msgstr "Передано" msgid "Didn't use map" msgstr "Карта не использовалась" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Таблица самых активных пользователей" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1088,7 +1101,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "У вас есть пароль на сайте %s?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1096,7 +1109,7 @@ msgstr "" msgid "Don’t know" msgstr "Не знаю" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Не любите заполнять формы?" @@ -1104,19 +1117,19 @@ msgstr "Не любите заполнять формы?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1128,8 +1141,8 @@ msgstr "" " Следовательно, вы можете добавлять много категорий для одного контакта учреждения.\n" " " -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1137,23 +1150,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Редактировать" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Редактировать информацию об учреждении" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1161,15 +1174,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1192,28 +1205,28 @@ msgstr "Редактирование данных о неполадке: %d" msgid "Editing update %d" msgstr "Редактирование обновления: %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Редактирование данных о пользователе: %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Редактор" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Адрес эл. почты" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1242,37 +1255,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Адрес эл. почты:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1280,8 +1293,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1293,8 +1306,8 @@ msgstr "" " Подробнее читайте в \n" " этой статье." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1304,8 +1317,8 @@ msgstr "" " разные конечные точки (и метод отправки), отличающиеся от тех, которые соответствуют учреждению. Например: для некоторых категорий проблем обращения должны\n" " отправляться по эл. почте, а для других – с помощью сервиса Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1313,7 +1326,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Конечная точка" @@ -1335,10 +1348,6 @@ msgstr "Введите индекс ближайшего отделения св msgid "Enter a nearby street name and area" msgstr "Введите название ближайшей улицы и регион" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Подробно опишите проблему" @@ -1352,13 +1361,13 @@ msgstr "Подробно опишите проблему" msgid "Error" msgstr "Ошибка" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Всё" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Пример почтового индекса: %s" @@ -1370,11 +1379,11 @@ msgstr "Примеры:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1391,7 +1400,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "Внешний URL" @@ -1412,25 +1421,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Дополнительная информация:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1453,11 +1462,12 @@ msgstr "" msgid "Filter report list" msgstr "Сортировать список обращений" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Впервые" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Исправьте это, выбрав зону покрытия в форме Редактирование информации об учреждении, расположенной ниже." @@ -1477,9 +1487,9 @@ msgstr "Исправлено (орган самоуправления)" msgid "Fixed - User" msgstr "Исправлено (пользователь)" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Пометить как удаленное" @@ -1487,8 +1497,8 @@ msgstr "Пометить как удаленное" msgid "Flag user" msgstr "Пометить пользователя" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Помечено" @@ -1496,7 +1506,7 @@ msgstr "Помечено" msgid "Flagged reports and users" msgstr "Помеченные обращения и профили пользователей" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Список помеченных профилей пользователей находится на странице Помеченное." @@ -1505,7 +1515,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "На помеченные аккаунты пользователей не накладываются ограничения. Это просто аккаунты, к которым проявляется повышенное внимание." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Помечено:" @@ -1521,7 +1531,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Подробнее читайте в разделе Как в FixMyStreet используется инструмент Mapit." @@ -1535,11 +1545,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Забыли пароль?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Перенаправлено во внешнее учреждение" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "Пожелание перенаправлено во внешнее учреждение" @@ -1555,6 +1565,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Получать обновления" @@ -1585,9 +1597,9 @@ msgstr "Здорово, что проблема решена!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1597,7 +1609,7 @@ msgstr "Поехали!" msgid "Going to send questionnaire?" msgstr "Собираетесь отправить опрос?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1605,7 +1617,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "График устранения неполадки: статус/время" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1656,11 +1668,11 @@ msgstr "Скрыто" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1681,9 +1693,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Скрыть метки" @@ -1700,11 +1712,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "История" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "На главную страницу" @@ -1712,7 +1724,7 @@ msgstr "На главную страницу" msgid "How to report a problem" msgstr "Как сообщить о проблеме" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Как успешно создавать и отправлять обращения" @@ -1734,7 +1746,7 @@ msgstr "Нам не удалось найти ваше обращение в б #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1743,8 +1755,8 @@ msgstr "Нам не удалось найти ваше обращение в б msgid "ID" msgstr "Идентификатор" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1768,7 +1780,7 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1776,7 +1788,7 @@ msgstr "" "Если одно местоположение обслуживают два и более учреждений, система сайта FixMyStreet объединяет похожие категории в единую запись,\n" " которая располагается в меню. Если вы хотите, чтобы это произошло, убедитесь, что вы используете одно и то же название категории для выбранных учреждений." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1788,6 +1800,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Если вы узнаете больше о статусе вашего обращения, обновите данные на нашем сайте." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1817,34 +1833,34 @@ msgstr "" "Если вы хотите внести новую публичную информацию о неполадке,\n" "введите ее здесь (важно: новые данные не будут отправлены в орган самоуправления)." -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Если вы не пользуетесь электронной почтой, а предпочитаете другой способ связи, введите сервисный идентификатор (Open311) или его эквивалент." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Неверный идентификатор" @@ -1852,7 +1868,7 @@ msgstr "Неверный идентификатор" msgid "Illegal feed selection" msgstr "Неверно выбран фид" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1864,7 +1880,7 @@ msgstr "Вы в черном списке?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Кроме того, возвращаются следующие параметры, которые не являются частью сервиса Open311 версии 2: agency_sent_datetime, title (также возвращается как часть описания), interface_used, comment_count, requestor_name (присутствует только если инициатор запроса разрешил отображение имени на сайте)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1880,15 +1896,15 @@ msgstr "Включить персональные данные заявител msgid "Incorrect has_photo value \"%s\"" msgstr "Нверно задано значение has_photo \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1896,7 +1912,7 @@ msgstr "" msgid "Internal notes" msgstr "Внутренние заметки" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1904,12 +1920,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Неверно задано значение agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Неверно задан формат: %s." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1930,7 +1946,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1943,8 +1959,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Последний редактор" @@ -1960,17 +1976,17 @@ msgstr "Последнее обновление:" msgid "Last update:" msgstr "Последнее обновление:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Оставьте поле пустым, если все обращения в это учреждение должны быть отправлены единым способом (например: «%s»)." @@ -1978,7 +1994,7 @@ msgstr "Оставьте поле пустым, если все обращени msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Все сообщения о неполадках в виде списка" @@ -2022,16 +2038,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2039,23 +2055,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "КАРТА" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Карта" @@ -2063,15 +2079,15 @@ msgstr "Карта" msgid "Mark as sent" msgstr "Пометить как отправленное" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Помечайте тех пользователей, за действиями которых вы хотите следить." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Сообщение" @@ -2087,19 +2103,19 @@ msgstr "Сообщение внешнему учреждению:" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Не найден параметр jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2107,10 +2123,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2128,12 +2144,12 @@ msgstr "" msgid "Month" msgstr "Месяц" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2145,11 +2161,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2158,7 +2174,7 @@ msgstr "Имя" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Имя:" @@ -2168,11 +2184,11 @@ msgstr "Имя:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2184,7 +2200,7 @@ msgstr "Ближайшая к метке дорога (генерируется msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ближайший к метке почтовый индекс (генерируется автоматически): %s (%sm мил.)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Ближайшая к метке дорога (генерируется автоматически с использованием сервиса Bing Maps): %s" @@ -2210,11 +2226,11 @@ msgstr "Почти готово! Проверьте почту…" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Добавлено новое учреждение" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Добавлен новый контакт в категории" @@ -2250,23 +2266,23 @@ msgstr "Новый номер телефона" msgid "New priority" msgstr "Новый приоритет" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2274,7 +2290,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Новые неполадки, адресованные в орган самоуправления: {{COUNCIL}}, находящегося в районе: {{WARD}} на сайте FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2310,11 +2326,11 @@ msgstr "Новый статус" msgid "New template" msgstr "Новый шаблон" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Самые новые" @@ -2326,10 +2342,10 @@ msgstr "Далее" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2337,11 +2353,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Нет" @@ -2349,11 +2364,7 @@ msgstr "Нет" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Территория не указана" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Нет учреждения" @@ -2361,7 +2372,7 @@ msgstr "Нет учреждения" msgid "No council selected" msgstr "Орган самоуправления не выбран" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Эти данные пока не были отредактированы." @@ -2378,11 +2389,11 @@ msgstr "Не найдено помеченных пользователей." msgid "No further updates" msgstr "Пока нет обновлений" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2390,12 +2401,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Результатов нет" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2414,15 +2425,15 @@ msgstr "Нет группы поддержки" msgid "None" msgstr "Нет" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2446,13 +2457,13 @@ msgstr "Первое обращение по этой проблеме" msgid "Not reported to council" msgstr "Первое обращение в органы самоуправления" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Примечание" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Примечание:" @@ -2476,15 +2487,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "ОК" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2492,16 +2503,16 @@ msgstr "" msgid "Old state" msgstr "Давний статус" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Самые старые" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2512,7 +2523,7 @@ msgstr "" msgid "Open" msgstr "Вопрос открыт" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2520,7 +2531,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API для сервера mySociety FixMyStreet" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2552,17 +2563,17 @@ msgstr "" msgid "Order" msgstr "Порядок" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Другое" @@ -2587,8 +2598,8 @@ msgstr "Владелец" msgid "Page Not Found" msgstr "Страница не найдена" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Родительская" @@ -2602,19 +2613,19 @@ msgstr "Частичная" msgid "Password (optional)" msgstr "Пароль (необязательно)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Постоянная ссылка" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2634,17 +2645,16 @@ msgstr "Номер телефона (необязательно)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Телефон:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2655,6 +2665,7 @@ msgstr "Телефон:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2669,7 +2680,7 @@ msgstr "Фото" msgid "Photo is required." msgstr "Необходимо добавить фото." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Необходимо добавить фото" @@ -2698,11 +2709,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Поставить метку на карте" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Будьте вежливы, выражайте свои мысли кратко и по существу." @@ -2719,7 +2734,7 @@ msgstr "Проверьте пароли и попробуйте еще раз" msgid "Please check your email address is correct" msgstr "Проверьте правильность написания адреса эл. почты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2727,11 +2742,11 @@ msgstr "Проверьте правильность написания адре msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Выберите категорию" @@ -2740,8 +2755,9 @@ msgstr "Выберите категорию" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Исправьте ошибки ниже" @@ -2760,13 +2776,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Будьте вежливы! Грубые, некорректные обращения к представителям органов самоуправления дискредитируют всех пользователей сервиса. " -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Введите текст сообщения" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2774,90 +2790,90 @@ msgstr "Введите текст сообщения" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Введите пароль" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Введите тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Введите действующий адрес эл. почты" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Введите действующий адрес эл. почты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Введите дополнительную информацию" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Введите свой эл. адрес" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Введите свое имя" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Введите свое полное имя. Эта информация необходима представителям органов самоуправления. Если вы не хотите, чтобы ваше полное имя отображалось на сайте, снимите галочку ниже." -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Введите свое имя" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Введите номер своего телефона" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Введите свою фамилию" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Напишите, как к вам обращаться" @@ -2885,7 +2901,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Укажите, хотите ли вы еще один опросник" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2911,11 +2927,11 @@ msgstr "" msgid "Please note:" msgstr "Внимание:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2951,16 +2967,16 @@ msgstr "Сообщите о статусе неполадки: проблема #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Напишите сообщение" @@ -2996,12 +3012,12 @@ msgstr "На базе платформы reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3503,20 +3533,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "Шаблоны ответов для: %s" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Место указано верно?" @@ -3528,15 +3558,15 @@ msgstr "Дорога находится в ведении: %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Дорога находится в ведении (информация из ресурса OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Повернуть влево" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3547,23 +3577,23 @@ msgstr "Повернуть вправо" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Перед поворотом фото необходимо сохранить все необходимые изменения в обращении" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Спутник" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Сохранить изменения" @@ -3572,12 +3602,12 @@ msgstr "Сохранить изменения" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3587,7 +3617,8 @@ msgstr "" msgid "Search Reports" msgstr "Искать обращения" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Искать пользователей" @@ -3596,7 +3627,7 @@ msgid "Search reports" msgstr "Искать обращения" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Поиск:" @@ -3606,7 +3637,7 @@ msgstr "Поиск:" msgid "Searching found no reports." msgstr "Обращений не найдено." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Пользователи не найдены." @@ -3622,17 +3653,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Выберите учреждение" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Выберите местность" @@ -3652,15 +3684,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3669,7 +3701,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "Обращение возвращено" @@ -3696,7 +3728,7 @@ msgstr "Сервис:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3705,9 +3737,9 @@ msgid "Share" msgstr "Поделиться" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3715,15 +3747,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3735,7 +3767,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Показывать мое имя на сайте" @@ -3747,21 +3779,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Показать метки" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3804,8 +3836,8 @@ msgstr "Выход" msgid "Some categories may require additional information." msgstr "Для некоторых категорий может потребоваться дополнительная информация." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3822,6 +3854,14 @@ msgstr "Некоторые фото недавних обращений" msgid "Some text to localize" msgstr "Некоторое количество текста для локализации" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "К сожалению, адреса по данному индексу относятся к коронным землям. Зона покрытия нашего ресурса на них не распространяется." @@ -3839,7 +3879,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "При подтверждении вашего обращения произошла ошибка." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3861,7 +3901,7 @@ msgstr "Не удалось проанализировать это местоп msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Не удалось сохранить фото. Повторите попытку." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3871,15 +3911,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3887,31 +3927,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Статус" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3924,14 +3965,14 @@ msgstr "" msgid "State:" msgstr "Статус:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3947,7 +3988,7 @@ msgid "Status" msgstr "Статус" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3960,7 +4001,7 @@ msgstr "Просмотр улиц" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3968,12 +4009,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Подразделение/учреждение" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Тема" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Тема:" @@ -3991,7 +4032,7 @@ msgstr "Отправить" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -4012,7 +4053,8 @@ msgstr "Отправлено" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Подписаться" @@ -4020,21 +4062,29 @@ msgstr "Подписаться" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4054,11 +4104,11 @@ msgstr "Отчеты об итогах" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4076,8 +4126,8 @@ msgstr "" msgid "Template «%s»" msgstr "Шаблон «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4087,7 +4137,7 @@ msgstr "Шаблоны" msgid "Text" msgstr "Текст" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Только текстовая версия" @@ -4131,7 +4181,7 @@ msgstr "Мы рады узнать, что проблема решена! Это msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Кажется, возникли трудности с загрузкой фото (%s).Повторите попытку." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Кажется, это местоположение не находится в ведении органа самоуправления. Возможно, им заведует другое учреждение или же вы указали место в другой стране. Попробуйте еще раз." @@ -4145,11 +4195,11 @@ msgstr "Это местоположение находится за предел msgid "That postcode was not recognised, sorry." msgstr "Не удалось распознать индекс." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Проблема помечена как отправленная." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Сейчас мы еще раз отправим это обращение." @@ -4161,23 +4211,23 @@ msgstr "Просмотр обращения невозможен на этом msgid "That report has been removed from FixMyStreet." msgstr "Это обращение было удалено с сайта FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4185,8 +4235,8 @@ msgstr "" "На электронный адрес будут приходить обращения из этой категории. \n" " Сюда же могут приходить и обращения из других категорий, адресованные одному и тому же учреждению." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4194,15 +4244,15 @@ msgstr "" "Конечная точка – это URL сервиса, с которым будет связываться система FixMyStreet \n" " при отправке обращений в данное учреждение." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." @@ -4210,10 +4260,10 @@ msgstr "" "Данные о юрисдикции необходимы только, если конечная точка используется для нескольких\n" " учреждений. Если учреждение привязано к отдельной конечной точке, оставьте это поле пустым." -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4225,8 +4275,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Параметр agency_responsible в Open311 версии 2 используется для составления списка администраций, которые получили обращение. Это не совсем стандартный способ использования этого атрибута в спецификации Open311 версии 2." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4243,12 +4293,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Вам необходимо предоставить максимум информации, чтобы сотрудники органа самоуправления могли помочь в решении проблемы. Укажите точное местонахождение неполадки (напр., «на стене»), опишите, что это и как давно вы впервые заметили неисправность (также можно приложить фото неполадки) и т. д." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "В таблице самых активных пользователей показана деятельность тех редакторов, которые отредактировали наибольшее количество записей." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Ошибка: %s" @@ -4294,7 +4344,7 @@ msgstr "Недавние обращения пользователей о про msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Возможно, ссылка устарела или вы не полностью ее скопировали." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Список доступных местоположений предоставлен сервисом MapIt на сайте: %s." @@ -4315,20 +4365,20 @@ msgstr "Запрошенный URL '%s' не был найден на этом msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Пользователь не смог определить местоположение неполадки на карте. Вместо этого он ввел данные о местности поблизости от неполадки." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4342,7 +4392,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Нет обращений." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4350,8 +4404,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "При загрузке страницы «Все обращения» произошла ошибка. Повторите попытку позже." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "При загрузке страницы произошла ошибка. Повторите попытку позже." @@ -4373,7 +4427,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Не удалось загрузить новые данные. Повторите попытку." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Не удалось загрузить обращение. Прочтите информациию ниже." @@ -4390,8 +4444,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4405,7 +4459,7 @@ msgstr "" " этой статье.\n" " " -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4423,7 +4477,7 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Реализация API пока работает в тестовом режиме, поэтому в процессе работы могут возникать неполадки. Они будут исправлены через некоторое время." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4433,12 +4487,12 @@ msgstr "" " Следовательно, ни одна из категорий не будет отображаться в раскрывающемся меню, когда пользователи будут подавать обращения.\n" " На данный момент пользователи не могут отправлять обращения в это учрждение." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "В настоящее время невозможно отправить обращения в данное учреждение, поскольку для него не указано контактных данных. " -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4446,18 +4500,17 @@ msgstr "" "В это учреждение будут отправляться только те обращения, неполадки в которых находятся на подведомственной территории.\n" " Чтобы получать обращения, учреждению необходимо иметь в ведении минимум одну область." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Поскольку пользователь не обозначил категорию проблемы, обращение было отправлено в оба органа самоуправления. Если данная проблема находится вне вашей ответственности, игнорируйте это обращение. Вы также можете написать нам, к какой категории относится данная проблема, и мы добавим новую информацию в систему." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Поскольку пользователь обозначил категорию проблемы, находящейся в ведении нескольких органов самоуправления, мы отправили это письмо во все эти инстанции. Если данная проблема находится вне вашей ответственности, игнорируйте это обращение." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Эта информация является обязательной" @@ -4474,7 +4527,11 @@ msgstr "Это сайт разработчиков, поэтому в его ф msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4490,12 +4547,16 @@ msgstr "Эта проблема не была решена" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Это обращение ожидает модерации." @@ -4516,7 +4577,7 @@ msgstr "Это обращение на данный момент помечен msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Эта веб-страница также содержит фото неполадки, предоставленное пользователем." @@ -4527,7 +4588,7 @@ msgstr "Эта веб-страница также содержит фото не msgid "Time spent (in minutes):" msgstr "Времени потрачено (в минутах):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Временной отрезок" @@ -4565,7 +4626,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Просмотр точного местоположения данной проблемы на карте" @@ -4594,34 +4655,34 @@ msgstr "" msgid "Total" msgstr "Всего" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Повторите попытку" @@ -4640,16 +4701,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4667,7 +4728,7 @@ msgstr "Неизвестный тип уведомления" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Неизвестная ошибка" @@ -4680,7 +4741,7 @@ msgstr "Неизвестная ошибка" msgid "Unknown problem ID" msgstr "Неизвестный идентификатор проблемы" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4693,7 +4754,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Обновление" @@ -4702,16 +4763,16 @@ msgstr "Обновление" msgid "Update %s created for problem %d; by %s" msgstr "Добавлены новые данные (%s) для проблемы: %d;, автор: %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Ниже представлены анонимно добавленные новые данные в: %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Ниже представлены новые данные, добавленные пользователем: %s, в: %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Обновить данные об учреждении" @@ -4736,7 +4797,7 @@ msgstr "В результате добавления данных проблем msgid "Update reopened problem" msgstr "В результате добавления данных проблема помечена как заново открытая" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Обновление статусов" @@ -4754,14 +4815,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Обновлено!" @@ -4786,12 +4847,12 @@ msgstr "Новые данные для: {{title}}" msgid "Updates to this problem, %s" msgstr "Новые данные для проблемы: %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4801,15 +4862,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4818,48 +4879,48 @@ msgstr "" msgid "Used map" msgstr "Использованная карта" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Пометка удалена" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Аккаунт пользователя помечен" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "При поиске пользователей на сайте система находит соответствия между именами пользователей и адресами эл. почты." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4868,20 +4929,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Пользователи" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Значения обновлены" @@ -4915,12 +4976,12 @@ msgstr "Посмотреть обращения по районам" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Просмотр местоположения" @@ -4955,7 +5016,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Скорее всего, эта проблема находится в ведении этой инстанции: %s;. Однако в нашей системе нет ее контактных данных. Если вам известен действующий адрес этой организации, напишите нам об этом." @@ -4970,8 +5031,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Мы обязуемся использовать предоставленные вами персональные данные в соответствии с нашей политикой конфиденциальности." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4985,8 +5046,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "Мы свяжемся с вами при первой возможности." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Когда были отредактированы данные" @@ -5006,14 +5071,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "И это еще не всё! Подпишитесь на другие уведомления бесплатно." @@ -5034,15 +5095,19 @@ msgstr "Хотите помочь проекту FixMyStreet? Наш код на msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Хотите получить еще один опрос через 4 недели? В нем мы напомним вам проверить статус обращения." +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Избегайте пунктуационных ошибок и не пишите сообщения заглавными буквами: всё это усложняет прочтение текста." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5051,20 +5116,19 @@ msgstr "Избегайте пунктуационных ошибок и не п #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Да" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Вы считаете, что эта проблема не нуждалась в модерации:" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5072,7 +5136,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Вы собираетесь пожаловаться на это обращение и считаете, что оно содержит оскорбления, конфиденциальную информацию или как-либо еще нарушает правила сайта:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Вы собираетесь пожаловаться на это обновление и считаете, что оно содержит оскорбления, конфиденциальную информацию или как-либо еще нарушает правила сайта:" @@ -5085,7 +5149,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Вы можете ознакомиться с проблемой на этом сайте." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Вы можете добавить адрес эл. почты пользователя, который проявляет себя некорректно, в черный список. Все дальнейшие обращения этого пользователя не будут опубликованы и отправлены." @@ -5093,7 +5157,7 @@ msgstr "Вы можете добавить адрес эл. почты поль msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Вы можете написать в службу технической поддержки: %s" @@ -5114,15 +5178,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Вы можете помочь нам: найдите контактные данные учреждения, в ведении которого находятся неполадки в районе (%s), и пришлите эти данные нам: %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Вы можете отметить учреждение как удаленное, если не хотите, чтобы его представители осуществляли деятельность на этом сайте." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Вы отказались; заполните форму выше" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5188,7 +5252,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Перед отправкой обращений вам необходимо добавить несколько учреждений (например, органы самоуправления или отделы)." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5213,9 +5277,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Ваш эл. адрес" @@ -5231,10 +5296,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Мы обязуемся использовать предоставленные вами персональные данные в соответствии с нашей политикой конфиденциальности" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Ваше имя" @@ -5250,7 +5315,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5273,7 +5338,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Ваш номер телефона" @@ -5298,7 +5363,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5315,25 +5380,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5367,8 +5431,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "редактировать информацию о пользователе" @@ -5377,12 +5441,12 @@ msgstr "редактировать информацию о пользовате msgid "from %s different users" msgstr "от разных пользователей (%s)" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "последнее обновление: %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "менее минуты" @@ -5393,7 +5457,7 @@ msgid "n/a" msgstr "недоступн." #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5433,7 +5497,7 @@ msgstr "введено: “%s”" msgid "other areas:" msgstr "другие области" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5441,7 +5505,7 @@ msgstr "" msgid "sign out" msgstr "выйти" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5458,19 +5522,19 @@ msgstr "метка не отображается, так как карта не msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "этот тип проблемы поблизости" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "сегодня" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5486,11 +5550,11 @@ msgstr "пользователь проживает недалеко от обн msgid "user is problem owner" msgstr "неполадка находится в собственности пользователя" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5499,7 +5563,7 @@ msgstr "" msgid "ward" msgstr "район" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5508,7 +5572,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5517,7 +5581,7 @@ msgstr[1] "%d дня" msgstr[2] "%d дней" msgstr[3] "%d дней" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5526,7 +5590,7 @@ msgstr[1] "%d часа" msgstr[2] "%d часов" msgstr[3] "%d часов" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5535,7 +5599,7 @@ msgstr[1] "%d минуты" msgstr[2] "%d минут" msgstr[3] "%d минут" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5553,7 +5617,7 @@ msgstr[1] "%d спонсора" msgstr[2] "%d спонсоров" msgstr[3] "%d спонсоров" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5562,7 +5626,7 @@ msgstr[1] "%d недели" msgstr[2] "%d недель" msgstr[3] "%d недель" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5652,7 +5716,7 @@ msgstr[1] "%s обновления обращений" msgstr[2] "%s обновлений обращений" msgstr[3] "%s обновлений обращений" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5679,7 +5743,7 @@ msgstr[1] "У нас еще нет подробной информации об msgstr[2] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место." msgstr[3] "У нас еще нет подробной информации об органах самоуправления, в ведении которых находится это место." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po index 1ef01d1aa6a..956d51f9342 100644 --- a/locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sl_SI.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,16 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 -# Matevz Langus , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: Matevz Langus , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Slovenian (Slovenia) (https://www.transifex.com/mysociety/teams/12067/sl_SI/)\n" "Language: sl_SI\n" "MIME-Version: 1.0\n" @@ -23,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "in" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -37,11 +36,11 @@ msgstr "in" msgid " or " msgstr "ali" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "največ %d znakov" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "" @@ -49,7 +48,7 @@ msgstr "" msgid "%d to %d of %d" msgstr "" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -155,7 +154,7 @@ msgstr "" msgid "(no longer exists)" msgstr "(ne obstaja več)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "" @@ -164,11 +163,11 @@ msgstr "" msgid "(optional)" msgstr "(opcijsko)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "(poslano vsem)" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(poslano obema)" @@ -177,13 +176,13 @@ msgstr "(poslano obema)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "— Izberi kategorijo —" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "— Izberi možnost —" @@ -191,8 +190,8 @@ msgstr "— Izberi možnost —" msgid "--Choose a template--" msgstr "—Izberi predlogo—" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -204,11 +203,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -233,11 +232,11 @@ msgstr "" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -257,21 +256,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "" @@ -292,8 +291,8 @@ msgstr "Dodaj polje" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Dodaj novo kategorijo" @@ -308,27 +307,27 @@ msgstr "Dodaj telefonsko številko" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Dodaj na seznam" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Dodaj uporabnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -336,7 +335,7 @@ msgstr "" msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -365,7 +364,6 @@ msgstr "" msgid "Alerts:" msgstr "Opozorila:" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -412,11 +410,15 @@ msgstr "" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -435,9 +437,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "" @@ -446,29 +448,29 @@ msgstr "" msgid "Another user" msgstr "Drug uporabnik" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Ali želite prekiniti prenos?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Ali ste prepričani?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -489,11 +491,11 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "" @@ -505,8 +507,8 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -522,7 +524,7 @@ msgstr "Samodejni odgovor:" msgid "Automated" msgstr "Samodejno" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -543,11 +545,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Nazaj" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Nazaj na vsa poročila" @@ -555,10 +557,10 @@ msgstr "Nazaj na vsa poročila" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -567,17 +569,17 @@ msgstr "" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "CSV datoteka" @@ -593,7 +595,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -604,15 +606,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -625,7 +627,7 @@ msgstr "" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -635,9 +637,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -664,11 +666,11 @@ msgstr "Zamenjaj geslo" msgid "Change phone number" msgstr "Zamenjaj telefon" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -679,17 +681,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -721,9 +723,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -767,17 +773,17 @@ msgstr "" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "Zmanjšaj zemljevid" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Nastavitev" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Potrdi" @@ -798,9 +804,9 @@ msgstr "" msgid "Confirmation" msgstr "Potrditev" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Potrjeno" @@ -830,7 +836,11 @@ msgstr "Kontaktiraj ekipo" msgid "Continue" msgstr "Nadaljuj" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -839,12 +849,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinate:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Ne morem najti uporabnika" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "" @@ -852,9 +862,11 @@ msgstr "" msgid "Council" msgstr "" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "" @@ -883,8 +895,8 @@ msgstr "Ustvari poročilo" msgid "Create an account" msgstr "Ustvari račun" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Ustvari kategorijo" @@ -892,15 +904,15 @@ msgstr "Ustvari kategorijo" msgid "Create priority" msgstr "Ustvari prioriteto" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "Ustvari poročila/posodobitve kot anonimni uporabnik" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -914,7 +926,7 @@ msgstr "Ustvari predlogo" msgid "Created" msgstr "Ustvarjeno" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -937,12 +949,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -970,32 +982,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "Tip napake" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "Izbriši" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Izbriši predlogo" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Izbrisano" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "Opiši zakaj moderiraš" @@ -1011,18 +1023,18 @@ msgstr "Opis" msgid "Description:" msgstr "Opis:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Podrobnosti" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1033,7 +1045,7 @@ msgstr "Podrobnosti:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "" @@ -1042,24 +1054,24 @@ msgstr "" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "Onemogoči" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "Onemogočeno:" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "Zavrzi spremembe" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1068,7 +1080,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1076,7 +1088,7 @@ msgstr "" msgid "Don’t know" msgstr "" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "" @@ -1084,19 +1096,19 @@ msgstr "" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1104,8 +1116,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1113,23 +1125,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1137,15 +1149,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1168,28 +1180,28 @@ msgstr "" msgid "Editing update %d" msgstr "" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1218,37 +1230,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "Pošlji povezavo za prijavo" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "E-mail preverjen:" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "E-mail:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "Omogoči" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1256,8 +1268,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1265,16 +1277,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1282,7 +1294,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "" @@ -1304,10 +1316,6 @@ msgstr "" msgid "Enter a nearby street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Vnesite podrobnosti težave" @@ -1321,13 +1329,13 @@ msgstr "Vnesite podrobnosti težave" msgid "Error" msgstr "Napaka" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Vse" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "" @@ -1339,11 +1347,11 @@ msgstr "Primeri:" msgid "Existing category" msgstr "Obstoječa kategorija" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "Razširi zemljevid" @@ -1360,7 +1368,7 @@ msgstr "Izvozi v CSV" msgid "External ID" msgstr "Zunanji ID:" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "Zunanja povezava" @@ -1381,25 +1389,25 @@ msgstr "" msgid "External team" msgstr "Zunanja ekipa" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "Dodatna Polja" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Dodatni datum:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Dodatne podrobnosti" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "Dodatna polja:" @@ -1422,11 +1430,12 @@ msgstr "" msgid "Filter report list" msgstr "" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1446,9 +1455,9 @@ msgstr "" msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "" @@ -1456,8 +1465,8 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "" @@ -1465,7 +1474,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1474,7 +1483,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "" @@ -1490,7 +1499,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" @@ -1504,11 +1513,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1524,6 +1533,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "" @@ -1554,9 +1565,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1566,7 +1577,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1574,7 +1585,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1625,11 +1636,11 @@ msgstr "Skrit" msgid "Hidden Field" msgstr "Skrito polje" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "Skrij vsa poročila in novosti" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "Skrij celotno poročilo" @@ -1650,9 +1661,9 @@ msgstr "Skrij moje ime v tem popravku" msgid "Hide my name on this report" msgstr "Skrij moje ime v tem poročilu" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "" @@ -1669,11 +1680,11 @@ msgstr "Skrij tvoje ime?" msgid "Hint" msgstr "Namig" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Zgodovina" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Domov" @@ -1681,7 +1692,7 @@ msgstr "Domov" msgid "How to report a problem" msgstr "Kako prijaviti težavo" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Kako uspešno poslati poročilo" @@ -1703,7 +1714,7 @@ msgstr "Na žalost nismo našli vaše težave v bazi podatkov.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1712,8 +1723,8 @@ msgstr "Na žalost nismo našli vaše težave v bazi podatkov.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1735,13 +1746,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1753,6 +1764,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1780,34 +1795,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Neveljaven ID" @@ -1815,7 +1830,7 @@ msgstr "Neveljaven ID" msgid "Illegal feed selection" msgstr "" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1827,7 +1842,7 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1843,15 +1858,15 @@ msgstr "" msgid "Incorrect has_photo value \"%s\"" msgstr "" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1859,7 +1874,7 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1867,12 +1882,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1893,7 +1908,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "Jezik" @@ -1906,8 +1921,8 @@ msgstr "Jeziki" msgid "Last 7 days" msgstr "Zadnjih 7 dni" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Zadnji urejevalec" @@ -1923,17 +1938,17 @@ msgstr "Zadnji popravek:" msgid "Last update:" msgstr "Zadnji popravek:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "Zemljepisna širina/Dolžina:" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" @@ -1941,7 +1956,7 @@ msgstr "" msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "" @@ -1985,16 +2000,16 @@ msgstr "Prijavi se s Facebookom" msgid "Log in with Twitter" msgstr "Prijavi se s Twitterjem" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Prijavi se z elektronskim naslovom" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "Odjavi se iz vseh sej" @@ -2002,23 +2017,23 @@ msgstr "Odjavi se iz vseh sej" msgid "Look up" msgstr "Poišči" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "ZEMLJEVID" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "Uredi seznam" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "Ročno sortiranje" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Zemljevid" @@ -2026,15 +2041,15 @@ msgstr "Zemljevid" msgid "Mark as sent" msgstr "Označi kot poslano" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Sporočilo" @@ -2050,19 +2065,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Moderiraj" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2070,10 +2085,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2091,12 +2106,12 @@ msgstr "" msgid "Month" msgstr "Mesec" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Najpogosteje komentirano" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2108,11 +2123,11 @@ msgstr "Najpogosteje komentirano" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2121,7 +2136,7 @@ msgstr "Ime" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Ime:" @@ -2131,11 +2146,11 @@ msgstr "Ime:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Navigiraj do te težave" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "Najbližji izračunan naslov:" @@ -2147,7 +2162,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2171,11 +2186,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "" @@ -2211,23 +2226,23 @@ msgstr "Nova telefonska številka:" msgid "New priority" msgstr "Nova prioriteta" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2235,7 +2250,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2271,11 +2286,11 @@ msgstr "Novo stanje" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Najnovejši" @@ -2287,10 +2302,10 @@ msgstr "Naslednji" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2298,11 +2313,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Ne" @@ -2310,11 +2324,7 @@ msgstr "Ne" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "" @@ -2322,7 +2332,7 @@ msgstr "" msgid "No council selected" msgstr "" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "" @@ -2339,11 +2349,11 @@ msgstr "" msgid "No further updates" msgstr "Ni novih posodobitev" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2351,12 +2361,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Ni vrnjenih rezultatov" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2373,15 +2383,15 @@ msgstr "" msgid "None" msgstr "Noben" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2401,13 +2411,13 @@ msgstr "" msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "" @@ -2431,15 +2441,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "V redu" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2447,16 +2457,16 @@ msgstr "" msgid "Old state" msgstr "Staro stanje" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Najstarejši" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2467,7 +2477,7 @@ msgstr "" msgid "Open" msgstr "Odpri" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2475,7 +2485,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2507,17 +2517,17 @@ msgstr "" msgid "Order" msgstr "Vrstni red" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "" @@ -2542,8 +2552,8 @@ msgstr "Lastnik" msgid "Page Not Found" msgstr "Stran ni bila najdena" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Starš" @@ -2557,19 +2567,19 @@ msgstr "Delno" msgid "Password (optional)" msgstr "Geslo (opcijsko)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Stalna povezava" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Dovoljenja:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2589,17 +2599,16 @@ msgstr "Telefon (opcijsko)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "Telefon preverjen." #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefon:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2610,6 +2619,7 @@ msgstr "Telefon:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2624,7 +2634,7 @@ msgstr "Slika" msgid "Photo is required." msgstr "Slika je obvezna." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Slika obvezna" @@ -2653,11 +2663,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "" @@ -2674,7 +2688,7 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2682,11 +2696,11 @@ msgstr "" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Prosim izberi kategorijo" @@ -2695,8 +2709,9 @@ msgstr "Prosim izberi kategorijo" msgid "Please choose a less commonly-used password" msgstr "Prosim izberi manj pogosto uporabljano geslo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2712,13 +2727,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Prosim vnesi sporočilo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2726,90 +2741,90 @@ msgstr "Prosim vnesi sporočilo" msgid "Please enter a mobile number" msgstr "Prosim vnesi mobilno številko" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Prosim vnesi ime" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Prosim vnesi geslo" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Prosim vnesi zadevo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Prosim vnesi veljaven elektronski naslov" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Prosim vnesi veljaven elektronski naslov" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "Prosim vnesi veljaven elektronski naslov ali telefonsko številko" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Prosim vnesi podrobnosti" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Prosim vnesi tvoj elektronski naslov" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Prosim vnesi svoje ime" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Vnesi svoje ime" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Vnesi svojo telefonsko številko" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Prosim vnesi svoj naziv" @@ -2837,7 +2852,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2863,11 +2878,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2903,16 +2918,16 @@ msgstr "Označi ali je bil problem rešen ali ne" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "Naloži samo fotografijo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "Preveri vsaj e-mail ali telefon" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Vnesi sporočilo" @@ -2948,12 +2963,12 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2967,14 +2982,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "" @@ -2997,7 +3016,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problem označen kot odprt." @@ -3005,7 +3024,7 @@ msgstr "Problem označen kot odprt." msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Težave" @@ -3030,7 +3049,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3055,8 +3074,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "" @@ -3082,7 +3101,7 @@ msgstr "Javne podrobnosti" msgid "Public response:" msgstr "Javni odgovor:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "Javni popravek:" @@ -3107,6 +3126,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Vprašalnik, ki ga je izpolnil prijavitelj problema" @@ -3130,11 +3150,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -3142,7 +3162,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3162,6 +3182,14 @@ msgstr "" msgid "RSS feed of updates to this problem" msgstr "" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3181,11 +3209,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Nedavno prijavljeni problemi" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "Nedavno posodobljeno" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "Zavrni prijavo" @@ -3197,7 +3225,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3211,9 +3239,9 @@ msgstr "Odstrani polje" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "Odstrani s seznama" @@ -3239,20 +3267,20 @@ msgstr "Odgovori uporabniku:" msgid "Report" msgstr "Poročilo" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "ID poročila:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Poročaj o problemu" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "Poročaj o problemu tukaj" @@ -3262,7 +3290,7 @@ msgstr "Poročaj o problemu tukaj" msgid "Report abuse" msgstr "Prijavi zlorabo" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3296,17 +3324,18 @@ msgid "Report, view, or discuss local problems" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Prijavljeno pred" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "" @@ -3350,28 +3379,28 @@ msgstr "Prijavljen:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Prijavljanje problema:" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Poročila" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3383,7 +3412,7 @@ msgstr "Poročila čakajoča potrditve" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3395,15 +3424,15 @@ msgstr "" msgid "Reports published" msgstr "Poročila obljavljena." -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3411,11 +3440,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "Poročila v čakajoča pošiljanja" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3455,20 +3484,20 @@ msgstr "Predloge odgovora" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "Vrni na original" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "Vrni na prvotno besedilo" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "Vrni na prvotni naslov" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Pravo mesto?" @@ -3480,15 +3509,15 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Zavrti v levo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3499,23 +3528,23 @@ msgstr "Zavrti v desno" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Vrtenje te slike bo uničilo neshranjene spremembe tega poročila." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelit" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Shrani spremembe" @@ -3524,12 +3553,12 @@ msgstr "Shrani spremembe" msgid "Save new fields" msgstr "Shrani nova polja" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3539,7 +3568,8 @@ msgstr "" msgid "Search Reports" msgstr "Išči poročila" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Išči uporabnike" @@ -3548,7 +3578,7 @@ msgid "Search reports" msgstr "Išči poročila" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Iskanje:" @@ -3558,7 +3588,7 @@ msgstr "Iskanje:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Iskanje ni našlo uporabnikov." @@ -3574,17 +3604,18 @@ msgstr "Varnost" msgid "See our privacy policy" msgstr "Poglej našo politiko zasebnosti" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Izberi območje" @@ -3604,15 +3635,15 @@ msgstr "" msgid "Select:" msgstr "Izberi:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "Pošlji" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3621,7 +3652,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3648,7 +3679,7 @@ msgstr "Storitev:" msgid "Set password" msgstr "Nastavi geslo" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "Nastavi na mojo trenutno lokacijo" @@ -3657,9 +3688,9 @@ msgid "Share" msgstr "Deli" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "Seznam" @@ -3667,15 +3698,15 @@ msgstr "Seznam" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3687,7 +3718,7 @@ msgstr "Prikaži sliko?" msgid "Show all updates" msgstr "Prikaži vse posodobitve" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Prikaži moje ime javno?" @@ -3699,21 +3730,21 @@ msgstr "Prikaži ime javno?" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "Prikaži starejše" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "Prikaži sliko" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "Prikaži prijaviteljevo ime" @@ -3756,8 +3787,8 @@ msgstr "Odjavi se" msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3772,6 +3803,14 @@ msgstr "" msgid "Some text to localize" msgstr "" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3789,7 +3828,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3811,7 +3850,7 @@ msgstr "" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3821,15 +3860,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "Oprosti, nimaš dovoljenja za to." -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Uredi po" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "Osebje:" @@ -3837,31 +3876,32 @@ msgstr "Osebje:" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3874,14 +3914,14 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3897,7 +3937,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3910,7 +3950,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "Podkategorija" @@ -3918,12 +3958,12 @@ msgstr "Podkategorija" msgid "Subdivision/Body" msgstr "" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Zadeva" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Zadeva:" @@ -3941,7 +3981,7 @@ msgstr "Pošlji" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3962,7 +4002,8 @@ msgstr "" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "" @@ -3970,21 +4011,29 @@ msgstr "" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "Naročeno:" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "Povzemi težavo" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "Povzemi svoje spremembe" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4004,11 +4053,11 @@ msgstr "" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "Superuser:" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4026,8 +4075,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4037,7 +4086,7 @@ msgstr "Predloge" msgid "Text" msgstr "Besedilo" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Samo besedilna verzija" @@ -4081,7 +4130,7 @@ msgstr "" msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" @@ -4095,11 +4144,11 @@ msgstr "Lokacije izgleda ni v Združenem kraljestvu. Poskusi ponovno." msgid "That postcode was not recognised, sorry." msgstr "Poštna številka je nepoznana. Oprosti." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Težava je označena kot poslana." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Težava bo poslana ponovno." @@ -4111,53 +4160,53 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "Uporabnik odjavljen." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4167,8 +4216,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4183,12 +4232,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Napaka: %s" @@ -4234,7 +4283,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4255,20 +4304,20 @@ msgstr "" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4280,7 +4329,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Ni poročil za prikaz." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4288,8 +4341,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Težava s prikazom strani. Poskusi kasneje." @@ -4311,7 +4364,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "" @@ -4328,8 +4381,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4338,7 +4391,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "Ti uporabniki niso bili posodobljeni." @@ -4356,36 +4409,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Podatek je obvezen" @@ -4402,7 +4454,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4418,12 +4474,16 @@ msgstr "Težava ni rešena" msgid "This problem is still ongoing" msgstr "Reševanje težave še traja" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -4444,7 +4504,7 @@ msgstr "" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4455,7 +4515,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4493,7 +4553,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "" @@ -4522,34 +4582,34 @@ msgstr "" msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "Prevodi" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Poskusi ponovno" @@ -4568,16 +4628,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "Tip" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4595,7 +4655,7 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Neznana napaka" @@ -4608,7 +4668,7 @@ msgstr "Neznana napaka" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4621,7 +4681,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "" @@ -4630,16 +4690,16 @@ msgstr "" msgid "Update %s created for problem %d; by %s" msgstr "" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "" @@ -4664,7 +4724,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4682,14 +4742,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Posodobljen!" @@ -4714,12 +4774,12 @@ msgstr "" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4729,15 +4789,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4746,48 +4806,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4796,20 +4856,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "" @@ -4843,12 +4903,12 @@ msgstr "" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Gledanje lokacije" @@ -4883,7 +4943,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "" @@ -4898,7 +4958,7 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." +msgid "We will only use your personal information in accordance with our privacy policy." msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 @@ -4913,8 +4973,12 @@ msgstr "Spletno mesto" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Ko je spreminjano" @@ -4934,14 +4998,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4962,15 +5022,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4979,20 +5043,19 @@ msgstr "" #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Ja" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "Ste brez povezave." @@ -5000,7 +5063,7 @@ msgstr "Ste brez povezave." msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5013,7 +5076,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5021,7 +5084,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5039,15 +5102,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5113,7 +5176,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5135,9 +5198,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5153,10 +5217,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "" @@ -5172,7 +5236,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5195,7 +5259,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "" @@ -5220,7 +5284,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5237,25 +5301,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5289,8 +5352,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5299,12 +5362,12 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "" @@ -5315,7 +5378,7 @@ msgid "n/a" msgstr "" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5355,7 +5418,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5363,7 +5426,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5380,19 +5443,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5408,11 +5471,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5421,7 +5484,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5430,7 +5493,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5439,7 +5502,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5448,7 +5511,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5457,7 +5520,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5475,7 +5538,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5484,7 +5547,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5574,7 +5637,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5601,7 +5664,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po index 7eee4637449..aa14faa836b 100644 --- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Albanian (https://www.transifex.com/mysociety/teams/12067/sq/)\n" "Language: sq\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "dhe" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "dhe" msgid " or " msgstr "ose" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d përpunuar nga %s" @@ -48,7 +48,7 @@ msgstr "%d përpunuar nga %s" msgid "%d to %d of %d" msgstr "%d në %d të %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -160,7 +160,7 @@ msgstr "(si grafitit, deponitë ilegale, pllakat e thyera, apo ndriçimi rrugor) msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(nuk është dërguar në kuvend)" @@ -169,11 +169,11 @@ msgstr "(nuk është dërguar në kuvend)" msgid "(optional)" msgstr "(opsionale)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(dërguar te të dy)" @@ -182,13 +182,13 @@ msgstr "(dërguar te të dy)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Zgjedh kategorinë --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -196,8 +196,8 @@ msgstr "" msgid "--Choose a template--" msgstr "--Zgjedh shabllonin--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -212,11 +212,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -241,11 +241,11 @@ msgstr "Jo Me lejo të konfirmoj përditësimin me email" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Vërejtje: Ky raport është përcjellë për veprim. Ndryshimet e mëpasme nuk do të përcjellen." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Vërejtje: Ky raport nuk është përcjellë akoma për veprim. Ndryshimet mund të mos përcjellen më tutje." @@ -265,8 +265,8 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -276,13 +276,13 @@ msgstr "" " ku mund të dërgohen raportet. Mund të shtosh një apo më shumë kontakte\n" " për kategori të ndryshme të problemeve) te çdo zyre." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Shto kontakt duke përdorë formularin e mëposhtëm." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Shto zyre" @@ -303,8 +303,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Shto kategori të re" @@ -319,27 +319,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Shto në listë" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Shto përdorues" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Shto/modifiko kategoritë e problemeve" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Shto/modifiko prioritetet e përgjegjes" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Shto/modifiko shabllonat e përgjegjeve" @@ -347,7 +347,7 @@ msgstr "Shto/modifiko shabllonat e përgjegjeve" msgid "Added %s" msgstr "Shtoi %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Nëse e shtoni këtë raport në listë, ai do të largohet nga lista %s." @@ -376,7 +376,6 @@ msgstr "Më njofto për përditësimet e ardhme" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -423,11 +422,15 @@ msgstr "Të gjitha raportimet mes %s dhe %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -446,9 +449,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonim:" @@ -457,29 +460,29 @@ msgstr "Anonim:" msgid "Another user" msgstr "Përdorues tjetër" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "A je i sigurt se do ta ndërpresh këtë ngarkim?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "A je i sigurt?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Zona e mbuluar" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Zona:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Meqë kjo është faqe testuese dhe %s është e pavërtetë, raportimet që bëhen në këtë faqe do t'i dërgohen raportuesit, dhe jo kontaktit të dhënë në kategori." @@ -500,11 +503,11 @@ msgstr "Cakto te një zyre e jashtme:" msgid "Assign to subdivision:" msgstr "Cakto te një nëndepartament:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "Cakto përdoruesit në zona" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Caktuar për %s" @@ -516,8 +519,8 @@ msgstr "Për çdo kërkesë kthehen më së shumti %d raportime. Raportimet e kt msgid "At the moment only searching for and looking at reports work." msgstr "Për momentin funksionon vetëm kërkimi dhe shikimi i raportimeve." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "Përdoruesit e autorizuar mund të shoqërohen me kategoritë, në të cilat operojnë." @@ -533,7 +536,7 @@ msgstr "Pergjigje automatike:" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -554,11 +557,11 @@ msgstr "Mos përcillni informacione personale dhe targa të veturave" msgid "Awaiting moderation" msgstr "Në pritje të ndërmjetësimit" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Prapa" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Prapa te të gjitha raportimet" @@ -566,10 +569,10 @@ msgstr "Prapa te të gjitha raportimet" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -578,17 +581,17 @@ msgstr "Zyret" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Zyra" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Zyra:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -604,7 +607,7 @@ msgstr "Nuk po e gjeni emailin tonë? Shikoni në spam." msgid "Can't see the map? Skip this step" msgstr "Nuk mund ta shihni hartën? Kapërceni këtë hap" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -615,15 +618,15 @@ msgstr "Kategoritë" msgid "Categories:" msgstr "Kategoritë:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -636,7 +639,7 @@ msgstr "Kategoria" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategoria është ndryshuar nga ‘%s’ në ‘%s’" @@ -646,9 +649,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "norma fikse e kategorisë për probleme > më të vjetra se 4 javë" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -675,11 +678,11 @@ msgstr "Ndrysho fjalëkalimin" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "Çeko kërkohet inspektimi nëse raportimet në këtë kategori duhet të inspektohen para se të dërgohen." -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -697,7 +700,7 @@ msgstr "" " që raportet të paraqiten. Në Britani, kjo është përdorë për shërbime si psh kërkimi i një kontejneri shtesë\n" " për bërllog në një adresë të caktuar." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -705,11 +708,11 @@ msgstr "" "Zgjedh një emër të kategorisë që ka kuptim për publikun (p.sh., \"Shahtë\", \"Ndriçim\") por që kuptohet\n" " edhe nga zyra. Kjo kategori do të shfaqet në listën e menysë në faqen raporto-problemin." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -741,9 +744,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -787,17 +794,17 @@ msgstr "Ko-brandimi" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurimi" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Konfirmo" @@ -818,9 +825,9 @@ msgstr "Konfirmo me email në vend të futjes së fjalëkalimit. Kur konfirmoni, msgid "Confirmation" msgstr "Konfirmimi" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Konfirmuar" @@ -850,7 +857,11 @@ msgstr "Kontakto ekipin" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -859,12 +870,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinatat" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Përdoruesi nuk u gjet" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Vendndodhja nuk u gjet" @@ -872,9 +883,11 @@ msgstr "Vendndodhja nuk u gjet" msgid "Council" msgstr "Kuvendi" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Kontakti i kuvendit për %s" @@ -903,8 +916,8 @@ msgstr "Krijo raport" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Krijo kategori" @@ -912,15 +925,15 @@ msgstr "Krijo kategori" msgid "Create priority" msgstr "Krijo prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "Krijo raportim/përditësim si zyre" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "Krijo raportim/përditësim në emër të përdoruesit" @@ -934,7 +947,7 @@ msgstr "Krijo shabllon" msgid "Created" msgstr "U krijua" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -957,12 +970,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Aktualisht asnjë zyre nuk është krijuar." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Klienti nuk është i kontaktueshëm" @@ -990,32 +1003,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Fshij shabllonin" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Fshirë" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1031,18 +1044,18 @@ msgstr "Përshkrimi" msgid "Description:" msgstr "Përshkrimi:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detajet" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1053,7 +1066,7 @@ msgstr "Detajet:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Deleguar" @@ -1062,24 +1075,24 @@ msgstr "Deleguar" msgid "Didn't use map" msgstr "Pa përdorë hartën" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Tabela e tarifave" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Mos dërgo njoftime me email për komentet te krijuesi i raportimit" @@ -1088,7 +1101,7 @@ msgstr "Mos dërgo njoftime me email për komentet te krijuesi i raportimit" msgid "Do you have a %s password?" msgstr "E keni %s fjalëkalimin?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1096,7 +1109,7 @@ msgstr "" msgid "Don’t know" msgstr "Nuk e di" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Nuk ju pëlqejnë formularët?" @@ -1104,19 +1117,19 @@ msgstr "Nuk ju pëlqejnë formularët?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Lësho fotografitë këtu kliko për të ngarkuar" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1128,8 +1141,8 @@ msgstr "" " Kjo domethënë se mund të shtoni shumë kategori edhe nëse keni vetë një kontakt të zyres.\n" " " -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "Lindja/Veriu:" @@ -1137,23 +1150,23 @@ msgstr "Lindja/Veriu:" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Modifiko" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Modifiko detajet e zyres" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "Modifiko privilegjet e përdoruesit tjetër" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Modifiko kategorine" @@ -1161,15 +1174,15 @@ msgstr "Modifiko kategorine" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Modifiko prioritetin e raportimit" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Modifiko raportimet" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1192,28 +1205,28 @@ msgstr "Duke modifikuar problemin %d" msgid "Editing update %d" msgstr "Duke modifikuar përditësimin %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Duke modifikuar përdoruesin %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Redaktori" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Email" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1242,37 +1255,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Emaili:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1280,8 +1293,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1293,8 +1306,8 @@ msgstr "" " Për më shumë informata, shih \n" " këtë artikull." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1304,8 +1317,8 @@ msgstr "" " pika pranimi të ndryshme (apo metoda dërgimi) nga zyra. Për shembull, nëse raportimet për disa kategori \n" " duhet të dërgohen me email, ndërsa të tjerat përmjet Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1313,7 +1326,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Instanca e fundit" @@ -1335,10 +1348,6 @@ msgstr "Fut një kod postar në afërsi, apo emrin e rrugës / lagjes" msgid "Enter a nearby street name and area" msgstr "Fut emrin e një rruge / lagje në afërsi" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Përshkruaj problemin" @@ -1352,13 +1361,13 @@ msgstr "Përshkruaj problemin" msgid "Error" msgstr "Gabim" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Gjithëçka" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Shembull i kodit postar %s" @@ -1370,11 +1379,11 @@ msgstr "Shembuj:" msgid "Existing category" msgstr "Kategori ekzistuese" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1391,7 +1400,7 @@ msgstr "" msgid "External ID" msgstr "ID e jashtme" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "URL e jashtme" @@ -1412,25 +1421,25 @@ msgstr "" msgid "External team" msgstr "Ekip i jashtëm" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Të dhëna shtesë:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Detaje shtesë:" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1453,11 +1462,12 @@ msgstr "" msgid "Filter report list" msgstr "Filtro listën e raporteve" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Hera e parë" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Rregullo këtë duke zgjedhur zonën e mbuluar në fushën Modifiko detajet e zyres." @@ -1477,9 +1487,9 @@ msgstr "Rregulluar - Kuvendi" msgid "Fixed - User" msgstr "Rregulluar - Përdoruesi" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Marko si të fshirë" @@ -1487,8 +1497,8 @@ msgstr "Marko si të fshirë" msgid "Flag user" msgstr "Marko përdoruesin" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr " Markuar" @@ -1496,7 +1506,7 @@ msgstr " Markuar" msgid "Flagged reports and users" msgstr "Raportimet dhe përdoruesit e markuar" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Përdoruesit e markuar janë listuar në faqen e markimeve." @@ -1505,7 +1515,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Përdoruesit e markuar nuk janë të kufizuar në asnjë mënyrë. Ata markohen vetëm për t'u vënë re." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Markuar:" @@ -1521,7 +1531,7 @@ msgstr "Për rezultate më të mira përfshij pamjen nga afër dhe në gjerësi" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Për më shumë informata, shih Si përdoret Mapit nga FixMyStreet." @@ -1535,11 +1545,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Keni harruar fjalëkalimin?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Është përcjellë te një zyre e jashtme" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "Dëshirë për ta përcjellë te një zyre e jashtme" @@ -1555,6 +1565,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Merr përditësime" @@ -1585,9 +1597,9 @@ msgstr "Gëzohem që qenka rregulluar!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1597,7 +1609,7 @@ msgstr "Vazhdo" msgid "Going to send questionnaire?" msgstr "Do ta dërgoni pyetësorin?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "Jepni qasje administratorit" @@ -1605,7 +1617,7 @@ msgstr "Jepni qasje administratorit" msgid "Graph of problem creation by status over time" msgstr "Grafika e krijimit të raportimeve sipas statusit dhe kohës" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1656,11 +1668,11 @@ msgstr "Fshehur" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1681,9 +1693,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Fshih shenjën" @@ -1700,11 +1712,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Historia" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Ballina" @@ -1712,7 +1724,7 @@ msgstr "Ballina" msgid "How to report a problem" msgstr "Si të raportoj problemin" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Si të dërgoj raportimin me sukses" @@ -1734,7 +1746,7 @@ msgstr "Fatkeqësisht problemi juaj nuk u lokalizua në databazë.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1743,8 +1755,8 @@ msgstr "Fatkeqësisht problemi juaj nuk u lokalizua në databazë.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1768,7 +1780,7 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1776,7 +1788,7 @@ msgstr "" "Nëse dy apo më shum zyre shërbejnë në të njejtin lokacion, FixMyStreet i kombinon kategoritë identike në një të vetme\n" " në meny. Sigurohu që do të përdoret e njejta kategori te zyret nëse doni që të kombinohen." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1788,6 +1800,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Nëse merrni më shumë informat për statusin e problemi tuaj, kthehuni në faqe edhe bëni përditësimin." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Nëse doni që prioritet të jetë opcional për kategori specifike, zgjedhni këtu. Paracaktim është që të paraqiten te të gjitha kategoritë." @@ -1817,34 +1833,34 @@ msgstr "" "Nëse dëshironi ta bëni një përditësim publik, futeni këtu\n" "(vini re ky shenim nuk do të përcillet te zyrja)." -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Nëse jeni duke përdorë metodë dërgimi që nuk është email, shenoni ID e shërbimit (Open311) apo identifikuesin ekuivalent." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "ID e pavlefshme" @@ -1852,7 +1868,7 @@ msgstr "ID e pavlefshme" msgid "Illegal feed selection" msgstr "RSS jovalid" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1864,7 +1880,7 @@ msgstr "Në tabelën e abuzimeve?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Përveç kësaj, atributet në vijim që nuk janë pjesë e specifikimit Open311 v2 mund të kthehen: agency_sent_datetime, title (mund të kthehet si pjesë e përshkrimit), interface_used, comment_count, requestor_name (paraqitet vetëm kur kërkuesi ka lejuar që emri i tij të shfaqet në faqe)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1880,15 +1896,15 @@ msgstr "Përfshij të dhënat personale të raportuesit" msgid "Incorrect has_photo value \"%s\"" msgstr "Vlera e has_photo (ka foto) nuk është korrekte \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "Kërkohet inspektim" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "Instrukto kontraktorët se si të rregullohet problemi" @@ -1896,7 +1912,7 @@ msgstr "Instrukto kontraktorët se si të rregullohet problemi" msgid "Internal notes" msgstr "Shënime të brendshme" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1904,12 +1920,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Vlerë jovalide për agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Formati jovalid %s ." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "Vendndodhja jovalide. Lokacioni i ri duhet të mbulohet nga e njejta zyre." @@ -1930,7 +1946,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1943,8 +1959,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Modifikuesi i fundit" @@ -1960,17 +1976,17 @@ msgstr "Përditësimi i fundit:" msgid "Last update:" msgstr "Përditësimi i fundit:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "Perditesimi më i hershëm:" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Leni këtë të zbrazët nëse të gjitha raportimet për këtë zyre do të dërgohen me metodën e njejtë (psh. \"%s\")." @@ -1978,7 +1994,7 @@ msgstr "Leni këtë të zbrazët nëse të gjitha raportimet për këtë zyre do msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Listo të gjitha problemet e raportuara" @@ -2022,16 +2038,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2039,23 +2055,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "HARTA" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "Menagjo listat" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Harta" @@ -2063,15 +2079,15 @@ msgstr "Harta" msgid "Mark as sent" msgstr "Marko si të dërguar" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Marko përdoruesit, sjellje e të cilëve do ta përcjellësh si të markuar." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "Detajet e problemeve të markimit" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Mesazhi" @@ -2087,19 +2103,19 @@ msgstr "Mesazhi për zyre e jashtme:" msgid "Missing bodies:" msgstr "Zyret që mungojnë:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "ID e jurisdikcionit që mungon" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Modero" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "Detajet e raportimit të moderuar" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Modero këtë raportim" @@ -2107,10 +2123,10 @@ msgstr "Modero këtë raportim" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2128,12 +2144,12 @@ msgstr "" msgid "Month" msgstr "Muaji" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Më të komentuarit" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2145,11 +2161,11 @@ msgstr "Më të komentuarit" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2158,7 +2174,7 @@ msgstr "Emri" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Emri:" @@ -2168,11 +2184,11 @@ msgstr "Emri:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Navigo te ky problem" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2184,7 +2200,7 @@ msgstr "Rruga më e afërt e emërtuar te shenja e vendosur në hartë (gjenerua msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Kodi postar më i afërt te shenja e vendosur në hartë (gjeneruar automatikisht): %s (%sm away)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Rruga më e afërt e emërtuar te shenja e vendosur në hartë (gjeneruar automatikisht nga Bing Maps): %s" @@ -2210,11 +2226,11 @@ msgstr "Gati përfundoi! Shiko emailin tash…" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "U shtua një zyre e re" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "U shtua një kontakt i ri i kategorisë" @@ -2250,23 +2266,23 @@ msgstr "" msgid "New priority" msgstr "Prioritet i ri" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2274,7 +2290,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Problem i ri për {{COUNCIL}} brenda {{WARD}} lagjes në FixMyStreet" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2310,11 +2326,11 @@ msgstr "Gjendje e re" msgid "New template" msgstr "Shabllon i ri" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Më e reja" @@ -2326,10 +2342,10 @@ msgstr "Tjetra" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2337,11 +2353,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Jo" @@ -2349,11 +2364,7 @@ msgstr "Jo" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Pa zonë" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Pa zyre" @@ -2361,7 +2372,7 @@ msgstr "Pa zyre" msgid "No council selected" msgstr "Nuk është zgjedhur zyrja" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Asnjë ndryshim nuk është bërë ende." @@ -2378,11 +2389,11 @@ msgstr "Nuk ka përdorues të markuar" msgid "No further updates" msgstr "Nuk ka përditësime tjera" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2390,12 +2401,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Nuk u kthye asnjë rezultat" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2414,8 +2425,8 @@ msgstr "Asnjë përkrahës" msgid "None" msgstr "Asnjë" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." @@ -2423,8 +2434,8 @@ msgstr "" "Përdoruesit e rëndomtë (publik) nuk duhet të shoqërohen me zona.
\n" " Përdoruesit e punësuar të autorizuar mund të shoqërohen me zonën ku operojnë." -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2448,13 +2459,13 @@ msgstr "Nuk është raportuar më parë" msgid "Not reported to council" msgstr "Nuk i është raportuar zyres" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Shenim" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Shenim:" @@ -2478,15 +2489,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2494,16 +2505,16 @@ msgstr "" msgid "Old state" msgstr "Gjendje e vjetër" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Më të vjetrat" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2514,7 +2525,7 @@ msgstr "" msgid "Open" msgstr "Hapur" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "Çelësi API i Open311" @@ -2522,7 +2533,7 @@ msgstr "Çelësi API i Open311" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 për serverin mySociety FixMyStreet" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "Jurisdikcioni Open311" @@ -2554,17 +2565,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Tjera" @@ -2589,8 +2600,8 @@ msgstr "Pronari" msgid "Page Not Found" msgstr "Faqja nuk u gjet" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Instanca prindore" @@ -2604,19 +2615,19 @@ msgstr "I pjesshëm" msgid "Password (optional)" msgstr "Fjalëkalimi (opsional)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Privilegjet:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2636,17 +2647,16 @@ msgstr "Numri i telefonit (opsional)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefoni:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2657,6 +2667,7 @@ msgstr "Telefoni:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2671,7 +2682,7 @@ msgstr "Fotografia" msgid "Photo is required." msgstr "Fotografia është e domosdoshme" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Foto e domosdoshme" @@ -2700,11 +2711,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Vendos shenjën në hartë" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Ju lutem të jeni të sjellshëm, konciz dhe të saktë." @@ -2721,7 +2736,7 @@ msgstr "Ju lutem kontrolloni fjalëkalimin dhe provoni përsëri" msgid "Please check your email address is correct" msgstr "Ju lutem kontrolloni adresën e emailit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2729,11 +2744,11 @@ msgstr "Ju lutem kontrolloni adresën e emailit" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Ju lutem zgjedhni kategorinë" @@ -2742,8 +2757,9 @@ msgstr "Ju lutem zgjedhni kategorinë" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Ju lutem korrigjoni gabimet e mëposhtme" @@ -2762,13 +2778,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Ju lutemi mos u bëni abuziv — abuzimi i zyreve e zhvlerëson shërbimin për të gjithë përdoruesit." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Ju lutem shkruani mesazhin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2776,90 +2792,90 @@ msgstr "Ju lutem shkruani mesazhin" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Ju lutemi shkruani emrin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "Ju lutem shkruani emrin për këtë zyre" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Ju lutemi shkruani fjalëkalimin" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Ju lutemi shkruani titullin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Ju lutemi shkruani një email valid" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Ju lutemi jepni një adresë valide emaili" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Ju lutemi shkruani disa detaje" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Ju lutemi shkruani emailin tuaj" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Ju lutemi shkruani emrin tuaj" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Ju lutemi shkruani emrin tuaj të plotë, zyreve u duhen këto informata - nëse nuk doni që emri juaj të shfaqet, hiqni çekimin më poshtë" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Ju lutemi shkruani emrin tuaj" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Ju lutemi shkruani numrin tuaj të telefonit" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Ju lutemi shkruani mbiemrin tuaj (opsionale) " -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Ju lutemi shkruani titullin tuaj" @@ -2887,7 +2903,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ju lutemi shenoni nëse doni të pranoni edhe një pyetësor tjetër" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2913,11 +2929,11 @@ msgstr "Ju lutemi vini re se përditësimi juaj nuk është postuarreputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "Raportimet do të dërgohen automatikisht pa u inspektuar nëse reputacioni i përdoruesit është mbi këtë vlerë. Bëje 0 nëse të gjitha raportimet duhet të inspektohen pavarësisht reputacionit." -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "Pragu i reputacionit" @@ -3505,20 +3535,20 @@ msgstr "Shablloni i përgjigjes" msgid "Response Templates for %s" msgstr "Shablloni i përgjigjes për %s" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Vendi i duhur?" @@ -3530,15 +3560,15 @@ msgstr "Operatori i rrugës për këtë rrugë me emër (nxjerrë nga referenca msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operatori i rrugës për këtë rrugë me emër (nga OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rrotullo majtas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3549,23 +3579,23 @@ msgstr "Rrotullo djathtas" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rrotullimi i kësaj fotografie do t'i humbas ndërrimet e paruajtura në këtë raport." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Sateliti" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Ruaj ndryshimet" @@ -3574,12 +3604,12 @@ msgstr "Ruaj ndryshimet" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "Ruaj me përditësim publik" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3589,7 +3619,8 @@ msgstr "" msgid "Search Reports" msgstr "Kërko raportet" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Kërko përdoruesit" @@ -3598,7 +3629,7 @@ msgid "Search reports" msgstr "Kërko raportet" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Kërko:" @@ -3608,7 +3639,7 @@ msgstr "Kërko:" msgid "Searching found no reports." msgstr "Kerkimit nuk gjeti asnjë raport." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Kërkimi nuk gjeti asnjë përdorues." @@ -3624,17 +3655,18 @@ msgstr "" msgid "See our privacy policy" msgstr "Shih parimet tona të privacisë" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Zgjedh një zyre" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Zgjedh një zonë" @@ -3654,15 +3686,15 @@ msgstr "" msgid "Select:" msgstr "Zgjedh:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "Zgjedh statuset e zgjeruara Open311 me shërbim të përditësimit" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3671,7 +3703,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "Dërgo raportin prapa" @@ -3698,7 +3730,7 @@ msgstr "Shërbimi:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "Vednos në lokacionin tim aktual" @@ -3707,9 +3739,9 @@ msgid "Share" msgstr "Shpërndaj" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "Lista" @@ -3717,15 +3749,15 @@ msgstr "Lista" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Listuar" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "Listuar nga %s" @@ -3737,7 +3769,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Publiko emrin tim" @@ -3749,21 +3781,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Shfaq shenjat" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3806,8 +3838,8 @@ msgstr "Shkyçu" msgid "Some categories may require additional information." msgstr "Disa kategori mund të kërkojnë informacione shtesë." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3824,6 +3856,14 @@ msgstr "Disa foto nga raportimet e fundit" msgid "Some text to localize" msgstr "Tekst për përkthim" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Kërkojmë falje, ky kod postar duket të jetë nën mbrojtje të autorit, të cilën nuk e kemi." @@ -3841,7 +3881,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Kërkojmë falje, ndodhi një gabim gjatë konfirmimit të problemit tuaj." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3863,7 +3903,7 @@ msgstr "Kërkojmë falje, lokacioni ishte i pakuptueshëm. Provoni përsëri." msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Kërkojmë falje, nuk arritëm t'i ruajmë foto(t) tuaja, provoni përsëri." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3873,15 +3913,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "Kërkojmë falje, nuk keni privilegje për ta bërë këtë." -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Rradhit sipas" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "Përdoruesit e punësuar kanë privilegj për t'u kyçur në admin." -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "Nëpunësit:" @@ -3889,31 +3929,32 @@ msgstr "Nëpunësit:" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Statusi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3926,14 +3967,14 @@ msgstr "" msgid "State:" msgstr "Statusi:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3949,7 +3990,7 @@ msgid "Status" msgstr "Statusi" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3962,7 +4003,7 @@ msgstr "Pamja e rrugës" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3970,12 +4011,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Nëndrejtoria/Zyra" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Tema" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Tema:" @@ -3993,7 +4034,7 @@ msgstr "Dërgo" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -4014,7 +4055,8 @@ msgstr "Dërguar" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Abonohu" @@ -4022,21 +4064,29 @@ msgstr "Abonohu" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "Përmblidhe problemin" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "Përmblidh ndryshimet" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4056,11 +4106,11 @@ msgstr "Raportet përmbledhëse" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "Përdorues i privilegjuar" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "Përdoruesit e privilegjuar kanë të drejta të kryejnë të gjitha veprimet në admin." @@ -4078,8 +4128,8 @@ msgstr "" msgid "Template «%s»" msgstr "Shablloni «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4089,7 +4139,7 @@ msgstr "Shabllonet" msgid "Text" msgstr "Teksti" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Verzioni vetëm tekst" @@ -4133,7 +4183,7 @@ msgstr "Falemnderit, na vjen mirë që është rregulluar! A mund t'ju pyesim, n msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Kjo foto nuk duket të jetë ngarkuar mirë (%s), ju lutemi provoni prap." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Ky lokacion nuk duket të jetë mbuluar nga zyrja; ndoshta është jashtë shtetit. Ju lutemi provoni prap." @@ -4147,11 +4197,11 @@ msgstr "Ky lokacion nuk duket se është brenda kufijve të shtetit; provoni pra msgid "That postcode was not recognised, sorry." msgstr "Ky kod postar nuk është i njohur, na vjen keq." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Problemi u markua i dërguar." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Ky problem nuk do të ridërgohet." @@ -4163,23 +4213,23 @@ msgstr "Raporti nuk mund të shihet në %s." msgid "That report has been removed from FixMyStreet." msgstr "Ky raport është fshirë nga FixMyStreet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4187,8 +4237,8 @@ msgstr "" "Adresa e emailit është destinacioni, ku dërgohen raportet e kësaj kategorie. \n" " Kategoritë tjera për këtë zyre mund ta kenë të njejtën adresë." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4196,15 +4246,15 @@ msgstr "" "Pika përfundimtare është URL e shërbimit, ku FixMyStreet do të lidhet \n" " kur çon raporte në këtë zyre." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." @@ -4212,10 +4262,10 @@ msgstr "" "Jurisdiksioni nevojitet vetëm nëse pika e kontaktit shërben për\n" " më shumë se një. Nëse zyrja ka pikën e vet të kontaktit, mund ta leni të zbrazët." -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4227,8 +4277,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Atributi agency_responsible në Open311 v2 përdoret për të listuar zyret që pranojnë këtë problem, gjë që nuk është mënyra se si definohet atributi në specifikacionin v2 të Open311." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4245,12 +4295,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Zyrja mund të mos jetë në gjendje t’ju ndihmojë, nëse nuk jepni sa më shumë detaje që mundeni. Ju lutemi përshkruani vendndodhjen e saktë të problemit (psh. në mur), çfarë është, sa kohë ka që është aty, një përshkrim (dhe foto tl problemit, nëse keni), etj." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Tabela e tarifave tregon aktivitetin e redaktorit (ai që ka redaktuar më së shumti raportime)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Gabimi ishte: %s" @@ -4296,7 +4346,7 @@ msgstr "Problemet e fundit brenda kufijve të {{NAME}} të raportuara nga përdo msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Vegza mund të ketë skaduar, apo ndoshta nuk e keni kopjuar si duhet." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Lista e të gjitha zonave ofrohet nga shërbimi MapIt në %s." @@ -4317,20 +4367,20 @@ msgstr "URL e kërkuar '%s' nuk u gjet në këtë server" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Përdoruesi nuk arriti ta lokalozojë problemin në hartë, por mund të shihni zonën përreth lokacionit që ka zgjedhur " -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4344,7 +4394,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Nuk ka raporte për t'u shfaqur." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4352,8 +4406,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Pati një problem për të shfaqur faqen e të gjitha raporteve. Ju lutemi provoni më vonë." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Pati një problem për të shfaqur këtë faqe. Ju lutemi provoni më vonë." @@ -4375,7 +4429,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Pati problem me përditësimin tuaj. Ju lutemi provoni përsëri." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Pati një problem me raportin tuaj. Ju lutemi lexoni mëposhtë." @@ -4392,8 +4446,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4407,7 +4461,7 @@ msgstr "" " këtë artikull.\n" " " -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4425,7 +4479,7 @@ msgstr "Këto shenime do të dërgohen te %s dhe të shfaqen pu msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Ky implementim i API-së është duke u punuar dhe nuk është stabil akoma. Mund të ndryshojë në të ardhmen pa paralajmërim." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4435,12 +4489,12 @@ msgstr "" " Kësisoji asnjë kategori nuk do të paraqitet në listën e kategorive kur përdoruesit raportojnë.\n" " Aktualisht, përdoruesit nuk mund të raportojnë te kjo zyre." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Kjo zyre nuk ka kontakt. Kjo domethënë se aktualisht problemet e raportuara te kjo zyre nuk do të dërgohen." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4448,18 +4502,17 @@ msgstr "" "Kësaj zyre do t'i dërgohen vetëm problemet që ndodhen në zonën e mbuluar.\n" " Një zyre do të pranojë raporte vetëm nëse ka së paku një zonë që e mbulon." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Ky email i është dërguar dy zyrave që e mbulojnë lokacionin, meqë përdoruesi nuk e ka kategorizuar; Ju lutemi injorojeni nëse nuk jeni zyra kompetente që merret me këtë çështje, apo na informoni se për çfarë kategorie është fjala, në mënyrë që ta shtojmë në sistem." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Ky problem u është dërguar disa zyrave që mbulojnë vendndodhjen e tij, meqenëse kategoria e zgjedhur figuron te të gjitha këto zyra; ju lutemi injorojeni nëse nuk jeni zyra kompetente për t'u marrë me këtë çështje." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ky informacion është i domosdoshëm" @@ -4476,7 +4529,11 @@ msgstr "Kjo faqe është në zhvillim e sipër; gjërat mund të prishen kohë p msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4492,12 +4549,16 @@ msgstr "Ky problem nuk është rregulluar" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Ky raport pret moderim." @@ -4518,7 +4579,7 @@ msgstr "Ky problem është markuar i hapur." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Kjo faqe përmban edhe foto të problemit, ngarkuar nga përdoruesi." @@ -4529,7 +4590,7 @@ msgstr "Kjo faqe përmban edhe foto të problemit, ngarkuar nga përdoruesi." msgid "Time spent (in minutes):" msgstr "Koha e shpenzuar (në minuta):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Kohëzgjatja" @@ -4567,7 +4628,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Për të parë hartën e saktë të lokacionit të këtij problemi" @@ -4596,34 +4657,34 @@ msgstr "" msgid "Total" msgstr "Total" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "Duhet menagjim i trafikut?" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "Besuar nga zyra:" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "Besuar për të bërë raporte që nuk kanë nevojë të inspektohen" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "Besuar:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Provoni përsëri" @@ -4642,16 +4703,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4669,7 +4730,7 @@ msgstr "Lloj i panjohur i njoftimit" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Gabim i panjohur" @@ -4682,7 +4743,7 @@ msgstr "Gabim i panjohur" msgid "Unknown problem ID" msgstr "ID e panjohur e gabimit" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4695,7 +4756,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Përditësim" @@ -4704,16 +4765,16 @@ msgstr "Përditësim" msgid "Update %s created for problem %d; by %s" msgstr "Përditësim %s i krijuar për problemin %d; nga %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Përditësimi i mëposhtëm është shtuar anonim te %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Përditësimi i mëposhtëm është shtuar nga %s te %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Zyra e përditësimit" @@ -4738,7 +4799,7 @@ msgstr "Përditësimi ka markuar problemin si të rregulluar" msgid "Update reopened problem" msgstr "Përditësimi ka rihapur problemin" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Statuset e përditësimit" @@ -4756,14 +4817,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Përditësuar!" @@ -4788,12 +4849,12 @@ msgstr "Përditësimet në {{title}}" msgid "Updates to this problem, %s" msgstr "Përditësimet për këtë problem, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4803,15 +4864,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "Shfrytëzojeni ekstenzionin dërgimi-i-përditësimit në Open311" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "Përdoreni këtë fushë për të shenuar detajet që shfaqen vetëm në admin. Shenimi nuk shfaqet në publik dhe nuk i dërgohet zyres." @@ -4820,48 +4881,48 @@ msgstr "Përdoreni këtë fushë për të shenuar detajet që shfaqen vetëm në msgid "Used map" msgstr "Harta në përdorim" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "ID e përdoruesit për t'i atribuuar komentet te" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Markimi i përdoruesit u hoq" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Përdorues i markuar" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Kërkimi i përdoruesit kërkon në emër dhe në adresë emaili." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4870,20 +4931,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Përdoruesit" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "Përdoruesit mund të kryejnë veprimet vijuese brenda zonës së caktuar të zyres." -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Vlerat e përditësuara" @@ -4917,12 +4978,12 @@ msgstr "Shih raportet sipas lagjes" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Pamja e lokacionit" @@ -4957,7 +5018,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "Na duhet adresa juaj e emailit, ju lutemi shenojeni mëposhtë." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "E kuptojmë që problemi mund të jetë përgjegjësi e %s, mirëpo aktualisht nuk e kemi kontaktin e tyre. Nëse e dini adresën e kontaktit, ju lutemi na njoftoni." @@ -4972,8 +5033,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Shenimet tuaja personale do t'i përdorim në përputhje me politikat tona të privacisë." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4987,8 +5048,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "Do t'ju kthejmë përgjigje sapo të jetë e mundur." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Kur u redaktua" @@ -5008,14 +5073,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "Tri foto mjaftojnë." - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "Pse të mjaftoheni? Krijoni më shumë njoftime gratis." @@ -5036,15 +5097,19 @@ msgstr "A dëshironi të kontribuoni në FixMyStreet? Kodi jonë është i hapur msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "A dëshironi të merrni pyetësorin tjetër pas 4 javësh, për t'ju kujtuar ta verifikoni statusin?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Nëse e shkruani mesazhin të tërin me germa të mëdha, e bëni atë vështirë të lexueshëm, njësoj si pa shenja pikësimi." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5053,20 +5118,19 @@ msgstr "Nëse e shkruani mesazhin të tërin me germa të mëdha, e bëni atë v #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Po" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Po ankoheni se raportimi është moderuar pa nevojë:" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5074,7 +5138,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Po raportoni se raportimi në fjalë është abuziv, ka informata personale, apo diçka të ngjajshme:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Po raportoni se përditësimi në fjalë është abuziv, përmban informata personale, apo diçka ngjashëm:" @@ -5087,7 +5151,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Ju mund të shihni problemin në këtë faqe." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Mund ta shtoni emailin e përdoruesit abuziv te lista e abuzimeve, gjë që raportimet e krijuara nga ky email i fsheh automatikisht dhe nuk i dërgon asnjëherë." @@ -5095,7 +5159,7 @@ msgstr "Mund ta shtoni emailin e përdoruesit abuziv te lista e abuzimeve, gjë msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Ju mund të kontaktoni ndihmën teknike në %s" @@ -5116,15 +5180,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Mund të na ndihmoni duke gjetur kontaktin adekuat për problemet e %s dhe duke na dërguar atë në %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Mund ta markoni një zyre si të fshirë nëse nuk doni që të jetë aktive në faqe." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Keni mohuar; ju lutemi plotësoni fushën mëlartë" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5190,7 +5254,7 @@ msgstr "Nuk keni listuar akoma asnjë raport." msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Duhet të shtoni zyre (si kuvende komunale, drejtori) para se të mund të dërgohen raportet." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5215,9 +5279,10 @@ msgstr "Llogaria juaj" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Emaili juaj" @@ -5233,10 +5298,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Informatat tuaja do të përdoren vetëm në përputhje me politikat tona të privacisë" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Emri juaj" @@ -5252,7 +5317,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5275,7 +5340,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Numri juaj i telefonit" @@ -5300,7 +5365,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5317,25 +5382,24 @@ msgstr "" msgid "Yourself" msgstr "Vetë ju" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "të gjitha" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5369,8 +5433,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "redakto përdoruesin" @@ -5379,12 +5443,12 @@ msgstr "redakto përdoruesin" msgid "from %s different users" msgstr "nga %s përdorues të ndryshëm" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "përditësimi i fundit %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "më pak se një minutë" @@ -5395,7 +5459,7 @@ msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "asnjë" @@ -5435,7 +5499,7 @@ msgstr "fillimisht shenuar: “%s”" msgid "other areas:" msgstr "zona tjera:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5443,7 +5507,7 @@ msgstr "" msgid "sign out" msgstr "shkyçu" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5460,19 +5524,19 @@ msgstr "nuk ka pin në hartë meqenëse përdoruesi nuk e ka përdorë" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "ky lloj i problemit lokal" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "sot" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5488,11 +5552,11 @@ msgstr "përdoruesi është nga e njejta zonë si problemi - %d" msgid "user is problem owner" msgstr "përdoruesi është pronar i problemit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5501,35 +5565,35 @@ msgstr "" msgid "ward" msgstr "lagje" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d ditë" msgstr[1] "%d ditë" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d orë" msgstr[1] "%d orë" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minutë" msgstr[1] "%d minuta" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5543,14 +5607,14 @@ msgid_plural "%d supporters" msgstr[0] "%d përkrahës" msgstr[1] "%d përkrahës" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d javë" msgstr[1] "%d javë" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5620,7 +5684,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s përditësim në raporte" msgstr[1] "%s përditësime në raporte" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5641,7 +5705,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Nuk kemi akoma detaje për zyren që mbulon këtë lokacion." msgstr[1] "Nuk kemi akoma detaje për zyret që mbulojnë këtë lokacion." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po index eed0b406fea..2aeccb9499a 100644 --- a/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Serbian (https://www.transifex.com/mysociety/teams/12067/sr/)\n" "Language: sr\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "i" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "i" msgid " or " msgstr "ili" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d izmenio %s" @@ -48,7 +48,7 @@ msgstr "%d izmenio %s" msgid "%d to %d of %d" msgstr "%d do %d %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -162,7 +162,7 @@ msgstr "(kao što su grafiti, slomljene ploče ili ulična rasveta)" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(nije poslato skupštini)" @@ -171,11 +171,11 @@ msgstr "(nije poslato skupštini)" msgid "(optional)" msgstr "(opcionalno)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(poslato oboma)" @@ -184,13 +184,13 @@ msgstr "(poslato oboma)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Izaberi kategoriju --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -198,8 +198,8 @@ msgstr "" msgid "--Choose a template--" msgstr "--Izaberi šablon--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -211,11 +211,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -240,11 +240,11 @@ msgstr "ne Dozvolite da mi da ažuriranje potvrdim e-mejlom" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Napomena: Ovaj izveštaj prosleđen je dalje za dalje radnje . Svaka dalja promena neće biti prosleđena." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Napomena: Ovaj izveštaj još uvek nije podnet dalje za dalje radnje. Svaka načinjena promena ne može biti prosleđena." @@ -264,8 +264,8 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -275,13 +275,13 @@ msgstr "" "kome se mogu poslati prijave o problemu. Možete dodati jedan ili više kontakata (za različite kategorije\n" "problema) za svaki organ." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Dodaj kontakt korišćenjem obrasca ispod." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Dodaj opštinu" @@ -302,8 +302,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Dodaj novu kategoriju" @@ -318,27 +318,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Dodaj u uži krug" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Dodaj korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Dodaj/izmeni problemske kategorije" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Dodaj/izmeni prioritete odgovora" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Dodaj/izmeni šablone odgovora" @@ -346,7 +346,7 @@ msgstr "Dodaj/izmeni šablone odgovora" msgid "Added %s" msgstr "Dodato %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Dodavanjem ove prijave u vaš uži krug uklonićete ga iz užeg kruga %s." @@ -375,7 +375,6 @@ msgstr "Upozori me na buduće ažurirane informacije" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -422,11 +421,15 @@ msgstr "Sve prijave između %s i %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -445,9 +448,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anoniman" @@ -456,29 +459,29 @@ msgstr "Anoniman" msgid "Another user" msgstr "Drugi korisnik" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Da li si siguran da želiš da otkažeš ovo otpremanje?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Da li si siguran?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Pokriveno područje" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Područje:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Pošto je ovo probna strana i %s pošto je lažna, prijave načinjene na ovoj strani biće poslate generatoru prijave, a ne kontaktu navedenom za kategoriju prijava." @@ -499,11 +502,11 @@ msgstr "Dodeli spoljnoj direkciji:" msgid "Assign to subdivision:" msgstr "Dodeli korisnicima po područjima:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "Dodeljeno %s" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Dodeljeno %s" @@ -515,8 +518,8 @@ msgstr "U većini slučajeva %d za svako pitanje se vraćaju zahtevi. Vraćeni z msgid "At the moment only searching for and looking at reports work." msgstr "U ovom trenutku funkcioniše samo pretraga i pregled prijava." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "Ovlašćeni članovi osoblja mogu se povezivati sa kategorijama na kojima rade." @@ -532,7 +535,7 @@ msgstr "Automatski odgovor:" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -553,11 +556,11 @@ msgstr "Izbegavajte lične informacije i registarske tablice vozila " msgid "Awaiting moderation" msgstr "Čekajući moderaciju" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Nazad" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Nazad na sve prijave" @@ -565,10 +568,10 @@ msgstr "Nazad na sve prijave" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -577,17 +580,17 @@ msgstr "Direkcije" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Direkcija" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Direkcija" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -603,7 +606,7 @@ msgstr "Can’t Ne možete da nađete naš e-mejl? Proverite vaš spam folde msgid "Can't see the map? Skip this step" msgstr "Ne vidite mapu? Preskočite ovaj korak" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -614,15 +617,15 @@ msgstr "Kategorije" msgid "Categories:" msgstr "Kategorija" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -635,7 +638,7 @@ msgstr "Kategorija je promenjena sa ‘%s’ na ‘%s’" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Norma rešavanja problema stari > od 4 nedelje " @@ -645,9 +648,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Norma rešavanja problema stari > od 4 nedelje " #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -674,11 +677,11 @@ msgstr "Promeni lozinku" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "Proveri inspection required ukoliko se izveštaji u ovoj kategoriji moraju proveriti pre nego što se pošalju." -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -696,7 +699,7 @@ msgstr "" "interes. U UK smo ovo koristili za usluge kao što je zahtevanje dodatnog kontejnera za smeće\n" "na konkretnoj adresi." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -704,11 +707,11 @@ msgstr "" "Odaberi category naziv koji ima smisla za javnost (npr. \"rupa\", \"javna rasveta\") koji istovremeno pomaže\n" "i ovoj direkciji. Isti će se pojavljivati u opadajućem meniju na strani Prijavi problem." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -740,9 +743,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -786,17 +793,17 @@ msgstr "" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguracija" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Potvrdi" @@ -817,9 +824,9 @@ msgstr "Potvrdi e-mejlom, pružajući novu lozinku u toj fazi. Nakon potvrde, a msgid "Confirmation" msgstr "Potvrda" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Potvrđeno" @@ -849,7 +856,11 @@ msgstr "Kontaktiraj tim" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -858,12 +869,12 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinate:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Korisnik se ne može naći" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Lokacija se ne može pretražiti" @@ -871,9 +882,11 @@ msgstr "Lokacija se ne može pretražiti" msgid "Council" msgstr "Skupština" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Kontakti skupštine za %s" @@ -902,8 +915,8 @@ msgstr "Kreiraj izveštaj" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Kreiraj kategoriju" @@ -911,15 +924,15 @@ msgstr "Kreiraj kategoriju" msgid "Create priority" msgstr "Kreiraj prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "Kreiraj izveštaje/ažurirane informacije za skupštinu opštine" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "Kreiraj izveštaje/najnovije informacije u ime korisnika" @@ -933,7 +946,7 @@ msgstr "Kreiraj šablon" msgid "Created" msgstr "Kreiran" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -956,12 +969,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Trenutno nije kreirano nikakvo telo." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Klijent nedostupan" @@ -989,32 +1002,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Izbriši šablon" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Izbrisano" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1030,18 +1043,18 @@ msgstr "Opis" msgid "Description:" msgstr "Opis:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Pojedinosti" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1052,7 +1065,7 @@ msgstr "Pojedinosti:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Prebačeno" @@ -1061,24 +1074,24 @@ msgstr "Prebačeno" msgid "Didn't use map" msgstr "Nije koristio mapu" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Nemojte slati e-mejl obaveštenja o komentarima dobijenim od podnosioca problema" @@ -1087,7 +1100,7 @@ msgstr "Nemojte slati e-mejl obaveštenja o komentarima dobijenim od podnosioca msgid "Do you have a %s password?" msgstr "Da li imate %s lozinku?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1095,7 +1108,7 @@ msgstr "" msgid "Don’t know" msgstr "Ne’t znam" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Ne dopada vam se oblik?" @@ -1103,19 +1116,19 @@ msgstr "Ne dopada vam se oblik?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Prevuci i spusti fotografije ovde ili klikni da učitaš" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1126,8 +1139,8 @@ msgstr "" "Različite kategorije mogu imati isti kontakt (emejl adresa).\n" "To znači da možete dodati mnoge kategorije čak i ukoliko imate samo jedan kontakt datog tela." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "Kretanje ka istoku/severu:" @@ -1135,23 +1148,23 @@ msgstr "Kretanje ka istoku/severu:" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Izmeni" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Izmeni podatke o opštini" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "Izmeni ovlašćenja drugih korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Izmeni kategoriju prijave" @@ -1159,15 +1172,15 @@ msgstr "Izmeni kategoriju prijave" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Izmeni prioritet prijave" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Izmeni prijave" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1190,28 +1203,28 @@ msgstr "Izmeni problem %d" msgid "Editing update %d" msgstr "Izmena ažuriranih informacija %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Izmeni korisnika %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Urednik" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Emejl" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1240,37 +1253,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Emejl:\t" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1278,8 +1291,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1287,16 +1300,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1304,7 +1317,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Završna tačka" @@ -1326,10 +1339,6 @@ msgstr "Unesi naziv obližnje ulice i oblasti" msgid "Enter a nearby street name and area" msgstr "Unesi naziv obližnje ulice i oblasti" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Opiši problem" @@ -1343,13 +1352,13 @@ msgstr "Opiši problem" msgid "Error" msgstr "Greška" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Sve" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Primer poštanskog broja %s" @@ -1361,11 +1370,11 @@ msgstr "Primeri" msgid "Existing category" msgstr "Postojeća kategorija" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1382,7 +1391,7 @@ msgstr "" msgid "External ID" msgstr "Spoljni ID" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "Spoljni URL" @@ -1403,25 +1412,25 @@ msgstr "" msgid "External team" msgstr "Spoljni tim" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Dodatni podaci:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Dodatni podaci" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1444,11 +1453,12 @@ msgstr "" msgid "Filter report list" msgstr "Filtriraj listu prijava" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Prvi put" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Uredite ovo izborom pokrivene oblasti u izmeni podatke o opštini na obrascu ispod." @@ -1468,9 +1478,9 @@ msgstr "Sređeno - Skupština" msgid "Fixed - User" msgstr "Sređeno - Korisnik" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Obeleži kao izbrisano" @@ -1478,8 +1488,8 @@ msgstr "Obeleži kao izbrisano" msgid "Flag user" msgstr "Obeleži korisnika " -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Obeleženo" @@ -1487,7 +1497,7 @@ msgstr "Obeleženo" msgid "Flagged reports and users" msgstr "Obeležene prijave i korisnici" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Obeleženi korisnici navedeni na strani ." @@ -1496,7 +1506,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Obeleženi korisnici nisu ograničeni ni na koji način. Ovo je samo lista korisnika koji su označeni za dalju pažnju." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Obeleženo" @@ -1512,7 +1522,7 @@ msgstr "Za najbolje rezultate uključite sliku u prvom planu " msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Za podrobnije informacije, vidi Kako Sredimoju ulicu koristi Mapit." @@ -1526,11 +1536,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Zaboravili ste lozinku?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Upućeno spoljnom telu" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "Često postavljana pitanja" @@ -1546,6 +1556,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Preuzmite najnovije informacije o %s problemima" @@ -1576,9 +1588,9 @@ msgstr "Drago mi je što čujem da je sređeno!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1588,7 +1600,7 @@ msgstr "Nastavi" msgid "Going to send questionnaire?" msgstr "Šaljete upitnik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "Dozvolite pristup administratoru" @@ -1596,7 +1608,7 @@ msgstr "Dozvolite pristup administratoru" msgid "Graph of problem creation by status over time" msgstr "Grafikon kreiranja problema po statusu duž vremena" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1647,11 +1659,11 @@ msgstr "Sakriveno" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1672,9 +1684,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Sakrij oznaku" @@ -1691,11 +1703,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Istorija" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Početak" @@ -1703,7 +1715,7 @@ msgstr "Početak" msgid "How to report a problem" msgstr "Kako prijaviti problem" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Kako poslati uspešne prijave" @@ -1725,7 +1737,7 @@ msgstr "I'm afraid we couldn't locate your problem in the database.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1734,8 +1746,8 @@ msgstr "I'm afraid we couldn't locate your problem in the database.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1759,7 +1771,7 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1767,7 +1779,7 @@ msgstr "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1779,6 +1791,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "If you get some more information about the status of your problem, please come back to the site and leave an update." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Ukoliko želite da samo ovaj prioritet bude opcija za konkretne kategorije, odaberite ih ovde. Automatski će se prikazivati u svim kategorijama." @@ -1806,34 +1822,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Ukoliko koristite način slanja koji ne podrazumeva e-mejl, unesite ID usluge (Open311) ili ekvivalentan identifikator ovde." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Ilegalni ID" @@ -1841,7 +1857,7 @@ msgstr "Ilegalni ID" msgid "Illegal feed selection" msgstr "Ilegalan izbor vesti" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1853,7 +1869,7 @@ msgstr "U tabeli zloupotreba?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1869,15 +1885,15 @@ msgstr "Uključi lične podatke podnosioca prijave" msgid "Incorrect has_photo value \"%s\"" msgstr "Netačno_photo value \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "Potrebna inspekcija" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "Naložite ugovaračima da reše probleme" @@ -1885,7 +1901,7 @@ msgstr "Naložite ugovaračima da reše probleme" msgid "Internal notes" msgstr "Interna zabeleška" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1893,12 +1909,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Pogrešna agencija_odgovorna value %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Nevažeći format %s naveden." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "Nevažeća lokacija. Novu lokaciju mora pokrivati ista skupština." @@ -1919,7 +1935,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1932,8 +1948,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Poslednji urednik" @@ -1949,17 +1965,17 @@ msgstr "Poslednje ažuriranje:" msgid "Last update:" msgstr "Poslednje ažuriranje:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "Nedavno ažuriran" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Ostavite ovo praznim ukoliko sve prijave ovom telu treba da budu poslate korišćenjem iste metode slanja (npr, \"%s\")." @@ -1967,7 +1983,7 @@ msgstr "Ostavite ovo praznim ukoliko sve prijave ovom telu treba da budu poslate msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Navedi sve prijavljene probleme" @@ -2011,16 +2027,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2028,23 +2044,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "MAPA" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "Upravljaj užim krugom" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Mapa" @@ -2052,15 +2068,15 @@ msgstr "Mapa" msgid "Mark as sent" msgstr "Označi kao poslat" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Označi kao uređen/zaključen u poslednjih osam nedelja" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Poruka" @@ -2076,19 +2092,19 @@ msgstr "Poruka spoljnom telu:" msgid "Missing bodies:" msgstr "Direkcije koje nedostaju:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Jurisdikcija koja nedostaje_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Uredi" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "Uredi pojedinosti o prijavi" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Uredi ovu prijavu" @@ -2096,10 +2112,10 @@ msgstr "Uredi ovu prijavu" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2117,12 +2133,12 @@ msgstr "" msgid "Month" msgstr "Mesec" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Najčešće komentarisani" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2134,11 +2150,11 @@ msgstr "Najčešće komentarisani" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2147,7 +2163,7 @@ msgstr "Ime" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Ime: %s" @@ -2157,11 +2173,11 @@ msgstr "Ime: %s" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Upravljaj ovim problemom" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2173,7 +2189,7 @@ msgstr "Najbliži imenovani put oznaci na mapi (automatski generisan korišćenj msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Najbliži poštanski broj oznaci na mapi (automatski generisan): %s (%sm away)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Najbliži put oznaci na mapi (automatski generisan korišćenjem Bing Maps): %s" @@ -2197,11 +2213,11 @@ msgstr "Pri kraju! Sada proverite vaš e-mejl…" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Dodata nova direkcija" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Dodata nova kontakt kategorija" @@ -2237,23 +2253,23 @@ msgstr "" msgid "New priority" msgstr "Novi prioritet" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2261,7 +2277,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Novi problemi u {{ COUNCIL }} {{WARD}} na Sredimojuulicu" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2297,11 +2313,11 @@ msgstr "Novo stanje" msgid "New template" msgstr "Novi šablon" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Najnovije" @@ -2313,10 +2329,10 @@ msgstr "Sledeće" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2324,11 +2340,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Ne" @@ -2336,11 +2351,7 @@ msgstr "Ne" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Nema oblasti" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Nema direkcije" @@ -2348,7 +2359,7 @@ msgstr "Nema direkcije" msgid "No council selected" msgstr "Nije odabrana skupština" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Nisu načinjene nikakve izmene." @@ -2365,11 +2376,11 @@ msgstr "No flagged users found." msgid "No further updates" msgstr "No further updates" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2377,12 +2388,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "No result returned" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2401,8 +2412,8 @@ msgstr "Nema pristalica" msgid "None" msgstr "Nijedan" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." @@ -2410,8 +2421,8 @@ msgstr "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2435,13 +2446,13 @@ msgstr "Nije prijavljen ranije" msgid "Not reported to council" msgstr "Nije prijavljen skupštini" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Napomena" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Napomena" @@ -2465,15 +2476,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "U redu" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2481,16 +2492,16 @@ msgstr "" msgid "Old state" msgstr "Staro stanje" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Najstariji" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2501,7 +2512,7 @@ msgstr "" msgid "Open" msgstr "Otvoren" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "Jurisdikcija Open311 " @@ -2509,7 +2520,7 @@ msgstr "Jurisdikcija Open311 " msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2541,17 +2552,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Drugi" @@ -2576,8 +2587,8 @@ msgstr "Vlasnik" msgid "Page Not Found" msgstr "Strana nije nađena" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Izvor" @@ -2591,19 +2602,19 @@ msgstr "Delimično" msgid "Password (optional)" msgstr "Lozinka (opcionalno)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Dozvole:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2623,17 +2634,16 @@ msgstr "Broj telefona (opcionalno)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Tel:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2644,6 +2654,7 @@ msgstr "Tel:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2658,7 +2669,7 @@ msgstr "Fotografija" msgid "Photo is required." msgstr "Fotografija potrebna." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Fotografija potrebna" @@ -2687,11 +2698,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Stavi oznaku na mapi" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Molimo vas budite ljubazni, koncizni i držite se suštine." @@ -2708,7 +2723,7 @@ msgstr "Molimo vas proverite lozinke i probajte ponovo " msgid "Please check your email address is correct" msgstr "Molimo vas proverite da li je vaša e-mejl adresa tačna " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2716,11 +2731,11 @@ msgstr "Molimo vas proverite da li je vaša e-mejl adresa tačna " msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Molimo vas izaberite kategoriju" @@ -2729,8 +2744,9 @@ msgstr "Molimo vas izaberite kategoriju" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Molimo vas ispravite greške ispod" @@ -2746,13 +2762,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Molimo vas unesite poruku" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2760,90 +2776,90 @@ msgstr "Molimo vas unesite poruku" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Molimo vas unesite ime" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "Molimo vas unesite naziv ovog tela" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Molimo vas unesite lozinku" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Molimo vas unesite predmet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Molimo vas unesite važeći e-mejl" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Molimo vas unesite važeću e-mejl adresu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Molimo vas unesite neke podatke" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Molimo vas unesite vaš e-mejl" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Molimo vas unesite vaše ime" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Molimo vas unesite vaše ime, skupština treba ove informacije – ukoliko ne želite da vam se ime prikazuje na stranici, skinite znak štikliranja iz polja ispod " -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Molimo vas unesite vaše ime" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Molimo vas unesite vaš broj telefona" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Molimo vas unesite vaše drugo ime" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Molimo vas unesite vaše zvanje" @@ -2871,7 +2887,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Molimo vas navedite da li biste hteli da dobijete još jedan upitnik " #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2897,11 +2913,11 @@ msgstr "Molimo vas imajte u vidu da vaša prijava još uvek nije poslat msgid "Please note:" msgstr "Molimo vas imajte u vidu:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "Molimo vas pružite javne informacije o ovoj prijavi." @@ -2937,16 +2953,16 @@ msgstr "Molimo vas iznesite da li je problem rešen ili ne " #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "Molimo vas postavite samo sliku" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Molimo vas napišite poruku" @@ -2982,12 +2998,12 @@ msgstr "Powered by msgid "Previous" msgstr "Prethodni" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "Prioriteti" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "Prioritet" @@ -3001,14 +3017,18 @@ msgstr "Privatnost" msgid "Privacy and cookies" msgstr "Privatnost i kolačići" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privatan" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Problem" @@ -3031,7 +3051,7 @@ msgstr "Problem %s poslat skupštini %s" msgid "Problem breakdown by state" msgstr "Pregled problema po stanju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problem označen kao otvoren." @@ -3039,7 +3059,7 @@ msgstr "Problem označen kao otvoren." msgid "Problem state change based on survey results" msgstr "Promena stanja predmeta na osnovu rezultata ankete " -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemi" @@ -3064,7 +3084,7 @@ msgstr "Nedavno prijavljeni problemi sređeni na Sredimojuulicu" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3089,8 +3109,8 @@ msgstr "Problemi u okviru %s, %s" msgid "Property address:" msgstr "Adresa imovine:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Pruži najnovije informacije" @@ -3116,7 +3136,7 @@ msgstr "" msgid "Public response:" msgstr "Javni odgovor:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "Javne informacije:" @@ -3141,6 +3161,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Upitnik %d poslat za problem %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Upitnik popunio podnosilac problema " @@ -3164,11 +3185,11 @@ msgstr "RSS vesti za %s naselje, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "RSS vesti %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "RSS vesti %s, u okviru %s naselja" @@ -3176,7 +3197,7 @@ msgstr "RSS vesti %s, u okviru %s naselja" msgid "RSS feed of nearby problems" msgstr "RSS vesti o obližnjim problemima" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3196,6 +3217,14 @@ msgstr "RSS vesti o nedavnim lokalnim potrebama" msgid "RSS feed of updates to this problem" msgstr "RSS vesti o najnovijim informacijama o ovom problemu" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3215,11 +3244,11 @@ msgstr "Nedavni lokalni problemi, %s" msgid "Recently reported problems" msgstr "Nedavno prijavljeno problema" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "Nedavno ažurirano" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3231,7 +3260,7 @@ msgstr "Zapamti da je Sredimojuulicu prvenstveno namenjeno za prijavljivanje fiz msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3245,9 +3274,9 @@ msgstr "Ukloni oznaku" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "Ukloni iz užeg kruga" @@ -3273,20 +3302,20 @@ msgstr "Odgovori korisniku:" msgid "Report" msgstr "Prijavi" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "ID prijave:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Prijavi problem" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3296,7 +3325,7 @@ msgstr "" msgid "Report abuse" msgstr "Prijavi zloupotrebu" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3330,17 +3359,18 @@ msgid "Report, view, or discuss local problems" msgstr "Prijavi, pregledaj ili diskutuj o lokalnim problemima" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Prijavljeni anonimno u %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Prijavljeni ranije" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Prijavio %s u %s" @@ -3384,28 +3414,28 @@ msgstr "Prijavio:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Prijavljivanje problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Prijave" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Prijave su ograničene na %s karaktera u dužini. Molimo vas skratite vašu prijavu" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3417,7 +3447,7 @@ msgstr "Prijave čekaju na odobrenje" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "Prijave pouzdanih korisnika šalju se odgovornom telu bez vršenja prethodne inspekcije." @@ -3429,15 +3459,15 @@ msgstr "" msgid "Reports published" msgstr "Objavljene prijave" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3445,11 +3475,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "Prijave koje čekaju da budu poslate" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "Prijave se šalju automatski bez potrebe za inspekcijom ukoliko je ugled korisnika na ili iznad ove vrednosti. Podesi na 0 ukoliko se bez obzira na to, moraju pregledati sve prijave." -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "Ugled:" @@ -3489,20 +3519,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Pravo mesto?" @@ -3514,15 +3544,15 @@ msgstr "Drumski operater za naziv ove ulice (proizilazi iz referentnog broja i v msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Drumski operater za naziv ove ulice (iz OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Okreni levo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3533,23 +3563,23 @@ msgstr "Okreni desno" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Okretanjem ove slike odbacuju se nesačuvane promene u izveštaju." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelitski" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Sačuvaj promene" @@ -3558,12 +3588,12 @@ msgstr "Sačuvaj promene" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "Sačuvaj javnim ažuriranjem" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3573,7 +3603,8 @@ msgstr "" msgid "Search Reports" msgstr "Pretraži prijave" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Pretraži korisnike" @@ -3582,7 +3613,7 @@ msgid "Search reports" msgstr "Pretraži prijave" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Pretraga:" @@ -3592,7 +3623,7 @@ msgstr "Pretraga:" msgid "Searching found no reports." msgstr "Pretraga bez rezultata." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Pretragom nađeno nula korisnika." @@ -3608,17 +3639,18 @@ msgstr "" msgid "See our privacy policy" msgstr "Vidi našu politiku privatnosti" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Odaberi telo" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Izaberi oblast" @@ -3638,15 +3670,15 @@ msgstr "" msgid "Select:" msgstr "Odaberi:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3655,7 +3687,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "Pošalji prijavu nazad" @@ -3682,7 +3714,7 @@ msgstr "Usluga:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "Postavi na moju aktuelnu lokaciju" @@ -3691,9 +3723,9 @@ msgid "Share" msgstr "Podeli" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "Uži krug" @@ -3701,15 +3733,15 @@ msgstr "Uži krug" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Ubačen u uži krug" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "Ubacio u uži krug %s" @@ -3721,7 +3753,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Prikaži moje ime javno" @@ -3733,21 +3765,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Prikaži oznake" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3790,8 +3822,8 @@ msgstr "Ispiši se" msgid "Some categories may require additional information." msgstr "Neke kategorije mogu iziskivati dodatne informacije." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3808,6 +3840,14 @@ msgstr "Neke fotografije nedavnih prijava" msgid "Some text to localize" msgstr "Tekst koji treba pronaći" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Izvinite, ovo je Crown poštanski broj koji ne pokrivamo." @@ -3825,7 +3865,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Izvinite, nastala je greška u potvrđivanju vašeg problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3847,7 +3887,7 @@ msgstr "Izvinite, nismo mogli da shvatimo datu lokaciju. Molimo vas pokušajte p msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Izvinite, nismo uspeli da sačuvamo vaše slike, molimo vas pokušajte ponovo." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3857,15 +3897,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "Izvinite, nemate dozvolu da to učinite." -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Sortiraj po" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "Korisnici iz reda osoblja imaju dozvolu da se upišu u admin." -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "Osoblje:" @@ -3873,31 +3913,32 @@ msgstr "Osoblje:" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Država" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3910,14 +3951,14 @@ msgstr "" msgid "State:" msgstr "Statistike" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3933,7 +3974,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3946,7 +3987,7 @@ msgstr "Izgled ulice" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3954,12 +3995,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Odsek/direkcija" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Predmet" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Predmet" @@ -3977,7 +4018,7 @@ msgstr "Podnesi" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3998,7 +4039,8 @@ msgstr "Podneo" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Pretplati se" @@ -4006,21 +4048,29 @@ msgstr "Pretplati se" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "Rezimiraj problem" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "Rezimiraj vaše promene" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4040,11 +4090,11 @@ msgstr "Kratki izveštaji" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "Superkorisnik:" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "Superkorisnici imaju dozvolu da obave sve radnje u sklopu admin." @@ -4062,8 +4112,8 @@ msgstr "" msgid "Template «%s»" msgstr "Šablon «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4073,7 +4123,7 @@ msgstr "Šabloni" msgid "Text" msgstr "Tekst" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Samo tekstualna verzija" @@ -4117,7 +4167,7 @@ msgstr "Hvala vam, drago nam je da čujemo da je sređeno! Da li samo možemo da msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Slika nije učitana ispravno (%s), molimo vas pokušajte ponovo." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Skupština ne pokriva datu lokaciju; možda je na moru ili van zemlje. Molimo vas pokušajte ponovo." @@ -4131,11 +4181,11 @@ msgstr "Po svemu sudeći data lokacija nije na Kosovu; molimo vas pokušajte pon msgid "That postcode was not recognised, sorry." msgstr "Dati poštanski broj nije prepoznat, izvinite." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Dati problem obeležen je kao poslat." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Dati problem će sada biti ponovo poslat." @@ -4147,23 +4197,23 @@ msgstr "Data prijava ne može se pogledati na %s." msgid "That report has been removed from FixMyStreet." msgstr "Data prijava uklonjena je sa Sredimojuulicu." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4171,8 +4221,8 @@ msgstr "" "E-mejl adresa predstavlja odredište na koju će biti poslati izveštaji o ovoj kategoriji.\n" "Druge kategorije ovog tela mogu imati istu e-mejl adresu." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4180,24 +4230,24 @@ msgstr "" "Poslednja tačka zapravo je URL službe sa kojom će se povezati Sredimojuulicu\n" "prilikom slanja prijave ovoj direkciji." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4209,8 +4259,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4227,12 +4277,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Direkcija neće’t biti u stanju da vam pomogne ukoliko ne ostavite što je moguće više pojedinosti. Molimo vas opišite tačnu lokaciju problema (npr. na zidu), šta je, koliko dugo je tu, opis (i sliku problema, ukoliko je imate), itd." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Greška je: %s" @@ -4278,7 +4328,7 @@ msgstr "Poslednji problemi u sklopu granica {{NAME}} koje su korisnici prijavili msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Link je možda istekao ili ga možda niste ’t ispravno kopirali i pejstirali." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Lista dostupnih oblasti pružena je uslugom MapIt u %s." @@ -4299,20 +4349,20 @@ msgstr "Traženi URL '%s' nije nađen na ovom serveru" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Korisnik nije mogao da pronađe problem na mapi, već samo da vidi oblast oko lokacije koju su uneli " -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4326,7 +4376,11 @@ msgstr "" msgid "There are no reports to show." msgstr "Nema prijava za prikazivanje." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4334,8 +4388,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Nastao je problem u prikazivanju strane Sve prijave. Molimo vas probajte ponovo kasnije." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Nastao je problem u prikazivanju ove strane. Molimo vas probajte ponovo kasnije." @@ -4357,7 +4411,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Bilo je problema sa vašim ažuriranjem. Molimo vas pokušajte ponovo." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Ima problema sa vašom prijavom. Molimo vas vidite ispod." @@ -4374,8 +4428,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4388,7 +4442,7 @@ msgstr "" "Za podrobnije informacije o Open311, vidi \n" "ovaj članak." -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4406,7 +4460,7 @@ msgstr "Iste će biti poslate %s i objavljene online kako bi ih msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Ova primena API je u toku i još uvek nije stabilizovana. Promeniće se bez ikakvog upozorenja ubuduće." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4416,12 +4470,12 @@ msgstr "" "Posledično, nijedna od njenih kategorija ne pojavljuje se u opadajućem meniju, kada korisnici prijavljuju probleme.\n" "U ovom trenutku, korisnici ne mogu prijavljivati probleme ovoj direkciji." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Ova direkcija nema nikakve kontakte. To znači da u ovom trenutku problemi koji se prijavljuju ovoj direkciji neće biti poslati." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4429,18 +4483,17 @@ msgstr "" "Ovoj direkciji šalju se samo one prijave o problemima koji se nalaze u pokrivenoj oblasti.\n" "Direkcija neće primati nikakve prijave, sem u slučaju da pokriva najmanje jednu oblast ." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Ovaj e-mejl poslat je obema direkcijama koje pokrivaju lokaciju problema, pošto je korisnik nije klasifikovao; molimo vas ignorišite je ukoliko niste prava direkcija koja treba da se pozabavi ovim pitanjem ili nam stavite na znanje koje je kategorije ovaj problem kako bismo mogli da ga dodamo u naš sistem." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Ovaj e-mejl poslat je nekolicini skupština koje pokrivaju lokaciju problema, pošto je odabrana kategorija pružena za sve njih; molimo vas ignorišite je ukoliko niste ispravna direkcija da se pozabavi ovim pitanjem." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ova informacija je tražena" @@ -4457,7 +4510,11 @@ msgstr "Ovo je veb stranica za programere; stvari se mogu pokvariti u svakom tre msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4473,12 +4530,16 @@ msgstr "Ovaj problem nije sređen" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Ova prijava čeka na moderatora." @@ -4499,7 +4560,7 @@ msgstr "Ova prijava trenutno je obeležena kao otvorena." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Ova internet stranica takođe sadrži fotografiju problema, koju je korisnik podneo." @@ -4510,7 +4571,7 @@ msgstr "Ova internet stranica takođe sadrži fotografiju problema, koju je kori msgid "Time spent (in minutes):" msgstr "Potrošeno vreme (u minutima):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Vremenski okvir" @@ -4548,7 +4609,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Da pogledate mapu sa preciznom lokacijom ovog pitanja" @@ -4577,34 +4638,34 @@ msgstr "" msgid "Total" msgstr "Ukupno" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "Potrebno upravljanje saobraćajem?" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "Kojima veruju direkcije:" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "Verodostojan da podnosi prijave koje ne moraju da se proveravaju " -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "Verodostojan:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Probajte ponovo" @@ -4623,16 +4684,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4650,7 +4711,7 @@ msgstr "Nepoznata vrsta obaveštenja" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Nepoznata greška" @@ -4663,7 +4724,7 @@ msgstr "Nepoznata greška" msgid "Unknown problem ID" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4676,7 +4737,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Ažuriranje" @@ -4685,16 +4746,16 @@ msgstr "Ažuriranje" msgid "Update %s created for problem %d; by %s" msgstr "Najnovije informacije %s kreirane za problem %d; od strane %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Najnovije informacije ispod dodate anonimno u %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Najnovije informacije ispod dodao %s u %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Pregled najnovijih informacija po državi" @@ -4719,7 +4780,7 @@ msgstr "Ažuriranjem problem označen kao rešen" msgid "Update reopened problem" msgstr "Ažuriranjem ponovo otvoren problem" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "" @@ -4737,14 +4798,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Ažuriran!" @@ -4769,12 +4830,12 @@ msgstr "Ažurirane informacije o {{title}}" msgid "Updates to this problem, %s" msgstr "Ažurirane informacije o ovom problemu, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4784,15 +4845,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "Upotrebi Open311 kao liniju za slanje ažuriranih informacija" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4801,48 +4862,48 @@ msgstr "" msgid "Used map" msgstr "Upotrebljena mapa" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Uklonjena oznaka korisnika" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Pretraga korisnika poklapa se sa kriterijumima u imenima i e-mejl adresama korisnika." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4851,20 +4912,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Korisnici" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "Korisnici mogu obaviti sledeće radnje u sklopu njima dodeljene direkcije ili oblasti." -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Ažurirane vrednosti" @@ -4898,12 +4959,12 @@ msgstr "Vidi prijave po naselju" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Pregled lokacije" @@ -4938,7 +4999,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "Treba nam vaša e-mejl adresa, molimo vas navedite je u nastavku." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Shvatamo da je ovaj problem odgovornost %s; međutim, u ovom trenutku nemamo nikakve kontakt podatke o njima. Ukoliko vam je poznata bilo kakva odgovarajuća kontakt adresa, molimo vas stupite sa nama u kontakt." @@ -4953,8 +5014,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Upotrebićemo samo vaše lične podatke u skladu sa našom politikom privatnosti." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4968,8 +5029,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "Bićemo u kontaktu sa vama čim budemo mogli." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Kada je izmenjena" @@ -4989,14 +5054,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "Whoa there Testino! Tri fotografije su dovoljne." - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -5017,15 +5078,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Da li biste voleli da dobijete još jedan upitnik za 4 nedelje, koji će vas podsetiti da proverite status?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Ukoliko napišete vašu poruku u potpunosti velikim slovima teško je pročitati je, kao i ako ne stavite znake interpunkcije." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -5034,20 +5099,19 @@ msgstr "Ukoliko napišete vašu poruku u potpunosti velikim slovima teško je pr #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Da" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5055,7 +5119,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" @@ -5068,7 +5132,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -5076,7 +5140,7 @@ msgstr "" msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "" @@ -5094,15 +5158,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5168,7 +5232,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5190,9 +5254,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" @@ -5208,10 +5273,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" +msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "" @@ -5227,7 +5292,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5250,7 +5315,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "" @@ -5275,7 +5340,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5292,25 +5357,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5344,8 +5408,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "" @@ -5354,12 +5418,12 @@ msgstr "" msgid "from %s different users" msgstr "" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "" @@ -5370,7 +5434,7 @@ msgid "n/a" msgstr "" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5410,7 +5474,7 @@ msgstr "" msgid "other areas:" msgstr "" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5418,7 +5482,7 @@ msgstr "" msgid "sign out" msgstr "" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5435,19 +5499,19 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5463,11 +5527,11 @@ msgstr "" msgid "user is problem owner" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5476,7 +5540,7 @@ msgstr "" msgid "ward" msgstr "" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5484,7 +5548,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5492,7 +5556,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5500,7 +5564,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5508,7 +5572,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5524,7 +5588,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5532,7 +5596,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5612,7 +5676,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5636,7 +5700,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index f7477236127..2ee426a8803 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,16 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 -# 8a4c21af7e89c2acc51a114e5dae9367, 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: 8a4c21af7e89c2acc51a114e5dae9367, 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Swedish (Sweden) (https://www.transifex.com/mysociety/teams/12067/sv_SE/)\n" "Language: sv_SE\n" "MIME-Version: 1.0\n" @@ -23,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr " och " -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -37,11 +36,11 @@ msgstr " och " msgid " or " msgstr " eller " -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "som flest %d tecken" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d ändringar av %s" @@ -49,7 +48,7 @@ msgstr "%d ändringar av %s" msgid "%d to %d of %d" msgstr "%d till %d av %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "%danvändare fanns redan" @@ -155,7 +154,7 @@ msgstr "(ex.v. graffiti, skräp, trasiga gatustenar eller belysning)" msgid "(no longer exists)" msgstr "(finns inte längre)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(ej skickat till kommunen)" @@ -164,11 +163,11 @@ msgstr "(ej skickat till kommunen)" msgid "(optional)" msgstr "(valfritt)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "(skickad till alla)" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(skickat till båda)" @@ -177,13 +176,13 @@ msgstr "(skickat till båda)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(vi har också RSS-flöden för problem inom %s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Välj en katagori --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "-- Välj ett alternativ --" @@ -191,8 +190,8 @@ msgstr "-- Välj ett alternativ --" msgid "--Choose a template--" msgstr "--Välj en mall--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -207,11 +206,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "

Rapporter, statistik och åtgärder för

%s

" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr " %s rapporter %s" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "%s sparad." @@ -236,11 +235,11 @@ msgstr "Nej Låt mig bekräfta uppdateringen via epost" msgid "No Let me confirm my update by email/text" msgstr "Nej Låt mig bekräfta min uppdatering via epost/SMS" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "Notera: Den här rapporten har vidarebefordrats. Ändringar i rapporten kommer inte att vidarebefordras." -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "Notera: Den här rapporten har vidarebefordrats. Ändringar i rapporten kommer inte att vidarebefordras." @@ -260,21 +259,21 @@ msgstr "Aktivera tvåfaktorsautentisering" msgid "Add" msgstr "Lägg till" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "Lägg till en förvaltning för varje administrativ förvaltning (som kommuner) till vilka problemrapporter kan skickas. Du kan lägga till en eller flera kontakter (för olika kategorier av problem) för varje förvaltning." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Lägg till en kontakt medelst formuläret nedan." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Lägg till förvaltning" @@ -295,8 +294,8 @@ msgstr "Lägg till fält" msgid "Add fixed state" msgstr "Lägg till löst tillstånd" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Ny kategori" @@ -311,27 +310,27 @@ msgstr "Lägg till telefonnummer" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Lägg till i slutlista" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Lägg till användare" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Lägg till eller ta bort problemkategorier" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Lägg till eller ta bort svarsprioriteringar" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Lägg till eller ta bort svarsmallar" @@ -339,7 +338,7 @@ msgstr "Lägg till eller ta bort svarsmallar" msgid "Added %s" msgstr "Lades till %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Att lägga till den här rapporten i din kortlista tar bort den från kortlistan för %s." @@ -368,7 +367,6 @@ msgstr "Varsko mig om framtida uppdateringar" msgid "Alerts:" msgstr "Bevakningar:" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -415,11 +413,15 @@ msgstr "Alla rapporter mellan %s och %s" msgid "All time" msgstr "Ärenden på årsbasis" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "Vi kan alternativt dölja ditt namn från samtliga av dina rapporter och uppdateringar på sajten:" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "Hämta alltid alla problem" @@ -438,9 +440,9 @@ msgid "Anonymous user" msgstr "Anonym användare" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonym:" @@ -449,29 +451,29 @@ msgstr "Anonym:" msgid "Another user" msgstr "Annan användare" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Är du säker på att du vill avbryta den här uppladdningen?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Är du säker?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Område som täcks" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "Område:" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Eftersom detta är en testsajt och %s är falskt kommer rapporter gjorda här att rapporteras till problemrapportören istället för kontakten angiven i problemkategorin" @@ -492,11 +494,11 @@ msgstr "Tilldela extern förvaltning:" msgid "Assign to subdivision:" msgstr "Tilldela underavdelning:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "Tilldela användare till områden" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Tilldelad %s" @@ -508,8 +510,8 @@ msgstr "Som mest returneras %d svar i varje förfrågan. De returnerade svaren msgid "At the moment only searching for and looking at reports work." msgstr "För tillfället fungerar det endast att söka för eller leta efter rapporter." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "Bemyndigade kommunanvändare kan vara associerade med de kategorier som de arbetar med." @@ -525,7 +527,7 @@ msgstr "Autosvar:" msgid "Automated" msgstr "Automatiserad" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "Fyll i rapportämne och -detaljer automatiskt" @@ -546,11 +548,11 @@ msgstr "Undvik personlig information och nummerplåtar" msgid "Awaiting moderation" msgstr "Väntar på att granskas" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Tillbaka" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Tillbaka till samtliga rapporter" @@ -558,10 +560,10 @@ msgstr "Tillbaka till samtliga rapporter" msgid "Ban user" msgstr "Förbjud användare" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -570,17 +572,17 @@ msgstr "Förvaltningar" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Förvaltning" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Förvaltning:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "CSV-fil" @@ -596,7 +598,7 @@ msgstr "Kan du inte hitta vårt e-brev? Kolla din skräppostmapp – det är msgid "Can't see the map? Skip this step" msgstr "Kan du inte se kartan? Hoppa över det här steget" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -607,15 +609,15 @@ msgstr "Kategorier" msgid "Categories:" msgstr "Kategorier:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -628,7 +630,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "Kategori och tillstånd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategori ändrat från ‘%s’ till ‘%s’" @@ -638,9 +640,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategorins lösningsnivå för problem över 4 veckor gamla" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -667,11 +669,11 @@ msgstr "Ändra lösenord" msgid "Change phone number" msgstr "Ändra telefonnummer" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "Bocka för inspektion krävs om rapporter i den här kategorin måste inspekteras innan de skickas." -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -682,17 +684,17 @@ msgid "" " at a specific address." msgstr "Kryssa i privat om rapporter i den här kategorin aldrig skall visas på sajten.
Kategorier är vanligtvis inte privata.
Detta är lämpligt för rapporter som du vill tillåta att användare rapporterar till förvaltningen, men där det inte finns något allmänt intresse av att visa rapporten. Det kan exempelvis vara en kategori som används för att sätta ut en extra papperskorg på en specifik adress." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "Välj ett kategorinamn som å ena sidan är förståeligt för allmänheten (som t. ex. \"Väggrop\" eller \"Gatubelysning\") men som också är hjälpsamt för förvaltningen. Dessa kommer att visas i en rullgardinsmeny på problemrapporteringssidan." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "Välj en annan" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "Rensa offline-data" @@ -724,9 +726,13 @@ msgstr "Klicka på länken i det mejlet för att logga in." msgid "Click the map or drag the pin to adjust the location" msgstr "Klicka på kartan eller dra kartnålen för att justera platsen" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -770,17 +776,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "Kod" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "Vik ihop karta" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Bekräfta" @@ -801,9 +807,9 @@ msgstr "Bekräfta via epost nedan genom att ange ett nytt lösenord. När du bek msgid "Confirmation" msgstr "Bekräftelse" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Bekräftat" @@ -833,7 +839,11 @@ msgstr "Kontakta teamet" msgid "Continue" msgstr "Fortsätt" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "Konvertera platsen från Easting/Northing" @@ -842,12 +852,12 @@ msgstr "Konvertera platsen från Easting/Northing" msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Kan inte hitta användaren" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Kunde inte slå upp platsen" @@ -855,9 +865,11 @@ msgstr "Kunde inte slå upp platsen" msgid "Council" msgstr "Kommun" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Kommunkontakter för %s" @@ -886,8 +898,8 @@ msgstr "Skapa en rapport" msgid "Create an account" msgstr "Skapa ett konto" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Skapa en kategori" @@ -895,15 +907,15 @@ msgstr "Skapa en kategori" msgid "Create priority" msgstr "Skapa prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "Skapa rapporter/uppdateringar som anonym användare" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "Skapa rapporter/uppdateringar som kommunen" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "Skapa rapporter/uppdateringar på en användares vägnar" @@ -917,7 +929,7 @@ msgstr "Välj mall" msgid "Created" msgstr "Skapad" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "Skapade %d nya användare" @@ -940,12 +952,12 @@ msgstr "Nuvarande token:" msgid "Currently grouped by %s" msgstr "För närvarande grupperade efter %s" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Inga förvaltningar har skapats ännu." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "Kund ej kontaktbar" @@ -973,32 +985,32 @@ msgstr "Standard" msgid "Default priority" msgstr "Standardprioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "Skapa, som standard, rapporter/uppdateringar som kommunen" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "Defekttyp" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "Ta bort" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Ta bort mall" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Borttagen" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "Beskriv varför du modererar detta" @@ -1014,18 +1026,18 @@ msgstr "Beskrivning" msgid "Description:" msgstr "Beskrivning:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "Detaljerad information är begränsad till %d tecken." -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detaljer" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1036,7 +1048,7 @@ msgstr "Detaljer:" msgid "Device and Site" msgstr "Enhet och sajt" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Delegerat" @@ -1045,24 +1057,24 @@ msgstr "Delegerat" msgid "Didn't use map" msgstr "Använde inte kartan" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Flitighetstopplistan" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "Inaktivera" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "Inaktiverad:" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "Ta bort ändringar" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Skicka inte e-postnotifikationer kring hämtade kommentarer till problemrapportens skapare" @@ -1071,7 +1083,7 @@ msgstr "Skicka inte e-postnotifikationer kring hämtade kommentarer till problem msgid "Do you have a %s password?" msgstr "Har du ett lösenord för %s?" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "Vill du automatiskt lyfta en defekt?" @@ -1079,7 +1091,7 @@ msgstr "Vill du automatiskt lyfta en defekt?" msgid "Don’t know" msgstr "Vet ej" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Gillar du inte formulär?" @@ -1087,19 +1099,19 @@ msgstr "Gillar du inte formulär?" msgid "Down one" msgstr "Ner en" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Släpp foton här eller klicka för att ladda upp" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "Dublett av" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "Dubletter" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1107,8 +1119,8 @@ msgid "" " " msgstr "Varje förvaltningskontakt har en kategori, och denna visas för allmänheten. Olika kategorier kan ha samma kontakt (e-postadress). Detta betyder att du kan lägga till flera kategorier även om du bara har en förvaltningskontakt." -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "Easting/Northing:" @@ -1116,23 +1128,23 @@ msgstr "Easting/Northing:" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Ändra" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Ändra förvaltningsdetaljer" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "Redigera andra användares rättigheter" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "Redigera rapportkategori" @@ -1140,15 +1152,15 @@ msgstr "Redigera rapportkategori" msgid "Edit report details" msgstr "Redigera rapportuppgifter" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "Redigera rapportprioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Redigera rapporter" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "Redigera användarnas detaljer/sök efter deras rapporter" @@ -1171,28 +1183,28 @@ msgstr "Ändrar problem %d" msgid "Editing update %d" msgstr "Ändrar uppdatering %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Ändrar användare %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Redaktör" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Epost" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1221,22 +1233,22 @@ msgstr "Mejla mig en länk eller SMS:a mig en kod för att logga in" msgid "Email me a link to sign in" msgstr "Mejla mig en länk för att logga in" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "Epost bekräftad:" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Epost:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "Aktivera" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" @@ -1246,8 +1258,8 @@ msgstr "" " och ändpunkten alltid returnerar en lista av alla problem. Detta kommer att tysta felmeddelanden om\n" " ogiltiga datum i problemen som hämtats." -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." @@ -1255,8 +1267,8 @@ msgstr "" "AktiveraKonvertera platsen från Easting/Northing om du har bockat för problemhämtning via Open311 ovan\n" " och problem hämtade från ändpunkten har platsen i Easting/Northing och inte Latitude/Longitude." -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1268,8 +1280,8 @@ msgstr "" " För mer information, se \n" " den här artikeln." -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1280,16 +1292,16 @@ msgstr "" "uppdateringar av befintliga rapporter. Om du är osäker (den kan förmodligen inte göra detta) så lämna detta tomt.\n" "För mer information, se denna artikel." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "Aktivera Kan överlåtas-inställningen om en eller flera kontakter har en annorlunda ändpunkt (och utskicksmetod) än förvaltningen. Vissa kategorier kan exempelvis skickas över e-post, medan andra över Open311." -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "Aktivering av detta kommer att tysta felmeddelanden som normalt sett uppstår när en uppdatering saknar en beskrivning" @@ -1297,7 +1309,7 @@ msgstr "Aktivering av detta kommer att tysta felmeddelanden som normalt sett upp msgid "End Date" msgstr "Slutdatum" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Ändpunkt" @@ -1319,10 +1331,6 @@ msgstr "Ange ett postnummer eller gatunamn och ort" msgid "Enter a nearby street name and area" msgstr "Ange ett närligande gatunamn och ort" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "Skriv in en gata, ett område, eller ett landmärke" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Skriv in information om problemet" @@ -1336,13 +1344,13 @@ msgstr "Skriv in information om problemet" msgid "Error" msgstr "Fel" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Allt" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Exempelpostnummer %s" @@ -1354,11 +1362,11 @@ msgstr "Exempel:" msgid "Existing category" msgstr "Befintlig kategori" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "Befintliga användare kommer inte att modifieras." -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "Expandera karta" @@ -1375,7 +1383,7 @@ msgstr "Exportera som CSV" msgid "External ID" msgstr "Externt ID" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "Extern URL" @@ -1396,25 +1404,25 @@ msgstr "Extern statuskod:" msgid "External team" msgstr "Externt arbetslag" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "Ytterligare fält" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Extra data:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Extra uppgifter" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "Extra fält:" @@ -1437,11 +1445,12 @@ msgstr "Fyll i dina uppgifter manuellt." msgid "Filter report list" msgstr "Filtrera rapportlista" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Första gången" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Lös detta genom att välja ett lämpligt område i Ändra förvaltningsdetaljer i formuläret nedan." @@ -1461,9 +1470,9 @@ msgstr "Löst - Kommun" msgid "Fixed - User" msgstr "Löst - Användare" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Flagga som borttagen" @@ -1471,8 +1480,8 @@ msgstr "Flagga som borttagen" msgid "Flag user" msgstr "Flagga användare" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Flaggat" @@ -1480,7 +1489,7 @@ msgstr "Flaggat" msgid "Flagged reports and users" msgstr "Flaggade rapporter och användare" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Flaggade användare är listade på flaggningssidan." @@ -1489,7 +1498,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Flaggade användare är inte begränsade på något sätt. Detta är bara en lista på användare som har markerats för uppmärksamhet." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Flaggat:" @@ -1505,7 +1514,7 @@ msgstr "Inkludera en närbild och en vidbild för bästa resultat" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "För varje alternativ är Nyckel det värde som är sparat i databasen för det alternativet, och Namn är värdet som visas för användaren." -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "För mer information, se How FixMyStreet uses Mapit." @@ -1519,11 +1528,11 @@ msgstr "Glömt lösenord" msgid "Forgotten your password?" msgstr "Glömt ditt lösenord?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "Vidarebefordrad till extern förvaltning" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "Vidarebefordrade önskan till extern förvaltning" @@ -1539,6 +1548,8 @@ msgstr "Generera token" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Få uppdateringar" @@ -1569,9 +1580,9 @@ msgstr "Vi är glada att höra att det har blivit löst!" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1581,7 +1592,7 @@ msgstr "Gå" msgid "Going to send questionnaire?" msgstr "Skicka enkät?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "Bevilja tillgång till administratörskontrollpanelen" @@ -1589,7 +1600,7 @@ msgstr "Bevilja tillgång till administratörskontrollpanelen" msgid "Graph of problem creation by status over time" msgstr "Visualisering av rapporter över tid" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "Grupp" @@ -1640,11 +1651,11 @@ msgstr "Gömd" msgid "Hidden Field" msgstr "Dolt fält" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "Dölj alla rapporter och uppdateringar" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "Dölj hela rapporten" @@ -1665,9 +1676,9 @@ msgstr "Dölj mitt namn i den här uppdateringen" msgid "Hide my name on this report" msgstr "Dölj mitt namn i den här rapporten" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Göm kartnålar" @@ -1684,11 +1695,11 @@ msgstr "Dölj ditt namn?" msgid "Hint" msgstr "Tips" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Historik" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Hem" @@ -1696,7 +1707,7 @@ msgstr "Hem" msgid "How to report a problem" msgstr "Hur man rapporterar ett problem" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Hur bra rapporter skickas" @@ -1718,7 +1729,7 @@ msgstr "Tyvärr kunde vi inte hitta ditt problem i databasen.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1727,8 +1738,8 @@ msgstr "Tyvärr kunde vi inte hitta ditt problem i databasen.\n" msgid "ID" msgstr "ID" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1750,13 +1761,13 @@ msgstr "Om ikryssad så kommer användaren inte att se ett textfält, utan endas msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "Om ikryssad kommer den här mallen att användas för Open311-uppdateringar som försätter rapporter i detta tillstånd." -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "Om två eller fler förvaltningar delar på ett geografiskt område, kombinerar FixMyStreet identiska kategorier till ett val i menyn. Se till att du använder samma kategorinamn om du vill att det skall hända." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "Om du kontaktar oss angående en specifik rapport eller uppdatering, inkludera då en länk till rapporten i meddelandet." @@ -1768,6 +1779,10 @@ msgstr "Om du genererar en ny token så kommer den token som används nu att slu msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Om du får mer information om problemets status får du gärna komma tillbaka hit och lämna en uppdatering." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Om du bara vill att den här prioriteringen skall vara valbar för specifika kategorier, välj då dessa här. Som standard visas den för samtliga kategorier." @@ -1795,12 +1810,12 @@ msgid "" "(please note it will not be sent to the council)." msgstr "Om du vill lämna ytterligare information om problemet, ange det här. Till exempel, hur upplevde du kommunikationen med kommunen? Om du skickar en rapport här kommer den att visas offentligt på FixaMinGata." -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "Om du använder en utskicksmetod som inte är e-post, ange ditt service-ID (Open311) eller liknande här." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" @@ -1810,8 +1825,8 @@ msgstr "" "sina uppdateringar. Aktivera utökade Open311-statusar om du vill tillåta att ytterligare tillstånd kan skickas.\n" " Kolla att ditt cobrand stödjer denna funktionalitet innan du aktiverar den." -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." @@ -1819,8 +1834,8 @@ msgstr "" "Om du har aktiverat sändningar av Open311-uppdateringar ovan, aktivera tystande av notifikationer \n" " om duinte vill att användaren ska bli notifierad när dessa uppdateringar skapas." -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" @@ -1830,7 +1845,7 @@ msgstr "" " FixaMinGata-användare ska stå som skaparen av dessa uppdateringar\n" " när de visas på sajten. Skriv in ID-värdet (ett nummer) för den önskade användaren." -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Ogiltigt ID" @@ -1838,7 +1853,7 @@ msgstr "Ogiltigt ID" msgid "Illegal feed selection" msgstr "Ogiltigt RSS-flöde" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "Importera användare" @@ -1850,7 +1865,7 @@ msgstr "I missbrukstabellen?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "I tillägg, följande attribut som inte är del av Open311 v2-specifikationen returneras: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "Inaktiv" @@ -1866,15 +1881,15 @@ msgstr "Inkludera rapportörens personuppgifter" msgid "Incorrect has_photo value \"%s\"" msgstr "Inkorrekt värde för has_photo, \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "Inspektera rapport" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "Inspektion krävs" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "Instruera entreprenörer att lösa problem" @@ -1882,7 +1897,7 @@ msgstr "Instruera entreprenörer att lösa problem" msgid "Internal notes" msgstr "Interna anteckningar" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "Internet-problem" @@ -1890,12 +1905,12 @@ msgstr "Internet-problem" msgid "Invalid agency_responsible value %s" msgstr "Inkorrekt värde för agency_responsible, \"%s\"" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Inkorrekt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "Oglitlig plats. Samma kommun måste ansvara för den nya platsen." @@ -1916,7 +1931,7 @@ msgstr "Nyckel" msgid "Label" msgstr "Etikett" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "Språk" @@ -1929,8 +1944,8 @@ msgstr "Språk" msgid "Last 7 days" msgstr "De senaste sju dagarna" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Senaste redaktör" @@ -1946,17 +1961,17 @@ msgstr "Senaste uppdatering:" msgid "Last update:" msgstr "Senaste uppdatering:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "Latitud/Longitud:" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "Tidigast uppdaterad" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Lämna den här blank om samtliga rapporter till den här förvaltningen skall skickas med samma utskicksmetod (exv. \"%s\")." @@ -1964,7 +1979,7 @@ msgstr "Lämna den här blank om samtliga rapporter till den här förvaltningen msgid "List" msgstr "Lista" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Lista alla rapporterade problem" @@ -2008,16 +2023,16 @@ msgstr "Logga in med Facebook" msgid "Log in with Twitter" msgstr "Logga in med Twitter" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "Logga in med e-post" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "Logga in med epost/SMS" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "Logga ut från alla sessioner" @@ -2025,23 +2040,23 @@ msgstr "Logga ut från alla sessioner" msgid "Look up" msgstr "Slå upp" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "KARTA" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "Gör till anonym på alla rapporter och uppdateringar" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "Hantera slutlista" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "Manuell ordning" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Karta" @@ -2049,15 +2064,15 @@ msgstr "Karta" msgid "Mark as sent" msgstr "Markera som skickad" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Markera användare som du vill hålla ett öga på som flaggade." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "Lägg till problemdetaljer" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Meddelande" @@ -2073,19 +2088,19 @@ msgstr "Meddelande till extern förvaltning:" msgid "Missing bodies:" msgstr "Saknade förvaltningar:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Saknat jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "Moderera" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "Moderera rapportdetaljer" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "Moderera den här rapporten" @@ -2093,10 +2108,10 @@ msgstr "Moderera den här rapporten" msgid "Moderate this update" msgstr "Moderera den här uppdateringen" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "Modererad av %s %s" @@ -2114,12 +2129,12 @@ msgstr "Modereringshistorik" msgid "Month" msgstr "Månad" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "Mest kommenterad" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2131,11 +2146,11 @@ msgstr "Mest kommenterad" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2144,7 +2159,7 @@ msgstr "Namn" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Namn:" @@ -2154,11 +2169,11 @@ msgstr "Namn:" msgid "Names are limited to %d characters in length." msgstr "Namn är begränsade till %d tecken i längd." -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "Navigera till det här problemet" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "Beräknad närmaste adress:" @@ -2170,7 +2185,7 @@ msgstr "Närmaste namngivna gata till placeringen på kartan (genereras automati msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Närmaste postnummer till placeringen på kartan (genereras automatiskt): %s (%s meter bort)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Närmaste gata till placeringen på kartan (genereras automatiskt av Bing Maps): %s" @@ -2196,11 +2211,11 @@ msgstr "Nästan klart! Kolla nu din epost." msgid "Nearly done! Now check your phone…" msgstr "Nästan klart! Kolla meddelandet som har skickats till din telefon." -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Ny förvaltning tillagd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Nya kategorikontakter tillagda" @@ -2236,23 +2251,23 @@ msgstr "Nytt telefonnummer:" msgid "New priority" msgstr "Ny prioritet" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "Nya problem för %s" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "Nya problem för %s" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "Nya problem för %s kommun i %s" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "Nya problem för område-ID %s" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "Nya problem för kommun-ID %s i förvaltning-ID %s" @@ -2260,7 +2275,7 @@ msgstr "Nya problem för kommun-ID %s i förvaltning-ID %s" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Nya problem för {{COUNCIL}} inom {{WARD}} området på FixaMinGata" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "Nya problem i närheten av %s,%s" @@ -2296,11 +2311,11 @@ msgstr "Ny status" msgid "New template" msgstr "Ny mall" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "Nya uppdateringar i rapporten %s" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "Senaste" @@ -2312,10 +2327,10 @@ msgstr "Nästa" msgid "Next:" msgstr "Nästa:" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2323,11 +2338,10 @@ msgstr "Nästa:" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Nej" @@ -2335,11 +2349,7 @@ msgstr "Nej" msgid "No account?" msgstr "Inget konto?" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "Inget område" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Ingen förvaltning" @@ -2347,7 +2357,7 @@ msgstr "Ingen förvaltning" msgid "No council selected" msgstr "Ingen kommun vald" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Inga ändringar har gjorts" @@ -2364,11 +2374,11 @@ msgstr "Inga flaggade användare kunde hittas." msgid "No further updates" msgstr "Inga fler uppdateringar" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "Inga inspektioner av den inspektören i det valda datumintervallet." -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "Inga inspektioner i det valda datumintervallet." @@ -2376,12 +2386,12 @@ msgstr "Inga inspektioner i det valda datumintervallet." msgid "No reports to show on map, here are some nearby:" msgstr "Det finns inga rapporter att visa på kartan. Här är några närliggande rapporter:" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Inget resultat returnerades" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2398,8 +2408,8 @@ msgstr "Inga supporters" msgid "None" msgstr "Inget" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." @@ -2407,8 +2417,8 @@ msgstr "" "Vanliga (offentliga) användare skall inte vara associerade med något område.
\n" " Godkända personalanvändare kan associeras med området inom vilket de är verksamma." -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2428,13 +2438,13 @@ msgstr "Ej rapporterat tidigare" msgid "Not reported to council" msgstr "Ej rapporterat till kommunen" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Observera" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Observera:" @@ -2458,15 +2468,15 @@ msgstr "Antalet problem rapporterade för varje kategori, under de senaste sju d msgid "Number of problems reported in each ward, in the last 7 days." msgstr "Antalet problem rapporterad i varje kommun, under de senaste sju dagarna." -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "Offline-data rensad" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "Offline-uppdateringsdata sparade" @@ -2474,16 +2484,16 @@ msgstr "Offline-uppdateringsdata sparade" msgid "Old state" msgstr "Äldre status" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "Äldst" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "På uppdrag av %s" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2494,7 +2504,7 @@ msgstr "På uppdrag av %s" msgid "Open" msgstr "Öppen" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "API-nyckel för Open311" @@ -2502,7 +2512,7 @@ msgstr "API-nyckel för Open311" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API för FixaMinGata" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "Jurisdiktion för Open311" @@ -2534,17 +2544,17 @@ msgstr "Eller prenumerera via RSS" msgid "Order" msgstr "Ordning" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Övrig" @@ -2569,8 +2579,8 @@ msgstr "Ägare" msgid "Page Not Found" msgstr "Sidan hittas ej" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Förälder" @@ -2584,19 +2594,19 @@ msgstr "Partiell" msgid "Password (optional)" msgstr "Lösenord (valfritt)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Permanent länk" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Rättigheter:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "Tillåt tomma uppdateringar" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "Telefonrapportör:" @@ -2616,17 +2626,16 @@ msgstr "Telefonnummer (valfritt)" msgid "Phone numbers are limited to %s characters in length." msgstr "Telefonnummer är begränsade till %s i teckenlängd." -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "Telefonnummer verifierat:" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefonnummer:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2637,6 +2646,7 @@ msgstr "Telefonnummer:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2651,7 +2661,7 @@ msgstr "Foto" msgid "Photo is required." msgstr "Foto är ett krav." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Foto krävs" @@ -2680,11 +2690,15 @@ msgstr "Välj din kommun" msgid "Pick your ward" msgstr "Välj din kommun" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Placera nålen på kartan" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Var vänlig, kortfattad och rakt på sak." @@ -2701,7 +2715,7 @@ msgstr "Vänligen kontrollera lösenordet och prova igen" msgid "Please check your email address is correct" msgstr "Vänligen kontrollera att din epostadress är korrekt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2709,11 +2723,11 @@ msgstr "Vänligen kontrollera att din epostadress är korrekt" msgid "Please check your phone number is correct" msgstr "Kontrollera att ditt telefonnummer är korrekt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Välj en kategori" @@ -2722,8 +2736,9 @@ msgstr "Välj en kategori" msgid "Please choose a less commonly-used password" msgstr "Välj ett ovanligare lösenord" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Vänligen korrigera felen nedan" @@ -2739,13 +2754,13 @@ msgstr "Var snäll och rapportera inga problem genom det här f msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Var snäll och missbruka inte tjänsten, det förstör för alla." -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Skriv in ett meddelande" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2753,90 +2768,90 @@ msgstr "Skriv in ett meddelande" msgid "Please enter a mobile number" msgstr "Skriv in ett mobiltelefonnummer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Skriv in ett namn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "Skriv in namnet på den här förvaltningen" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Skriv in ett lösenord" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Skriv in ett ärende" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Skriv in en giltig epostadress" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Skriv in en giltig epostadress" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "Skriv in en giltig epostadress eller ett giltigt telefonnummer" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Skriv några detaljer" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Skriv in din epostadress" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Skriv in ditt förnamn" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Skriv in ditt namn och efternamn om kommunen behöver den informationen. Om du inte vill att dit namn visas kan du välja det nedanför" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Skriv in ditt namn och efternamn" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Skriv in ditt telefonnummer" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Skriv in ditt efternamn" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Skriv in din titel" @@ -2864,7 +2879,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ange ifall du vill ta emot ett annat frågeformulär" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "Välj ett lösenord som är minst %d tecken långt" @@ -2890,11 +2905,11 @@ msgstr "Observera att din uppdatering inte har publicerats än. msgid "Please note:" msgstr "Observera:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "Ange ett dublett-ID eller en offentlig uppdatering för den här rapporten." -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "Tillhandahåll en offentlig uppdatering för den här rapporten." @@ -2930,16 +2945,16 @@ msgstr "Ange om problemet har lösts eller ej" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "Ladda upp endast en bild" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "Verifiera epostadressen, telefonnumret, eller båda" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Skriv ett meddelande" @@ -2975,12 +2990,12 @@ msgstr "Byggd på F msgid "Previous" msgstr "Föregående" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "Prioriteringar" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "Prioritet" @@ -2994,14 +3009,18 @@ msgstr "Personlig integritet" msgid "Privacy and cookies" msgstr "Integritetsskydd och kakor" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Privat" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Rapport" @@ -3024,7 +3043,7 @@ msgstr "Rapport %s skickad till %s" msgid "Problem breakdown by state" msgstr "Rapporter per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problemet markerat som öppet." @@ -3032,7 +3051,7 @@ msgstr "Problemet markerat som öppet." msgid "Problem state change based on survey results" msgstr "Problemets status ändrats baserat på utredningsresultat" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problem" @@ -3057,7 +3076,7 @@ msgstr "Problem nyligen rapporterade som lösta på FixaMinGata" msgid "Problems within %.1fkm of %s" msgstr "Problem inom %.1f km av %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3082,8 +3101,8 @@ msgstr "Problem inom %s, %s" msgid "Property address:" msgstr "Fastighetsadress:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Ge en uppdatering" @@ -3109,7 +3128,7 @@ msgstr "Offentliga uppgifter" msgid "Public response:" msgstr "Offentligt svar:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "Offentlig uppdatering:" @@ -3134,6 +3153,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Frågeformulär %d skickat för problem %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Frågeformulär ifyllt av rapportören" @@ -3157,11 +3177,11 @@ msgstr "RSS-flöde för område %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "RSS-flöde för %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "RSS-flöde för %s, inom område %s" @@ -3169,7 +3189,7 @@ msgstr "RSS-flöde för %s, inom område %s" msgid "RSS feed of nearby problems" msgstr "RSS-flöde av närliggande problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3189,6 +3209,14 @@ msgstr "RSS-flöde för senaste lokala problemen" msgid "RSS feed of updates to this problem" msgstr "RSS-flöde för uppdateringar till denna rapport" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3208,11 +3236,11 @@ msgstr "Senaste lokala rapporterna, %s" msgid "Recently reported problems" msgstr "Senaste rapporterade problemen" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "Senast uppdaterad" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "Avvisa rapport" @@ -3224,7 +3252,7 @@ msgstr "Kom ihåg att FixaMinGata primärt är avsett för att rapportera fysisk msgid "Remove" msgstr "Ta bort" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "Ta bort kontouppgifter" @@ -3238,9 +3266,9 @@ msgstr "Ta bort flagga" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "Ta bort från slutlista" @@ -3266,20 +3294,20 @@ msgstr "Besvara användare:" msgid "Report" msgstr "Rapportera" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "Rapport-ID:" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Rapportera ett problem" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "Rapportera ett problem här" @@ -3289,7 +3317,7 @@ msgstr "Rapportera ett problem här" msgid "Report abuse" msgstr "Rapportera missbruk" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3323,17 +3351,18 @@ msgid "Report, view, or discuss local problems" msgstr "Rapportera, visa, eller diskutera lokala problem" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Rapporterat anonymt %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Rapporterat tidigare" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Rapporterat av %s den %s" @@ -3377,28 +3406,28 @@ msgstr "Rapporterad:" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Rapportera ett problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Rapporter" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Rapporter kan bara innehålla %s tecken. Vänligen korta ner din rapport" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "Rapporter är begränsade till {0} i teckenlängd. Vänligen korta ner din uppdatering" @@ -3410,7 +3439,7 @@ msgstr "Rapporter som väntar på att godkännas" msgid "Reports by destination" msgstr "Rapporter efter mottagare" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "Rapporter som skapas av anförtrodda användare kommer att skickas till kommunen utan att inspekteras först." @@ -3422,15 +3451,15 @@ msgstr "Rapporter i närheten av %s skickas till olika förvaltare, beroende på msgid "Reports published" msgstr "Publicerade rapporter" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "Rapporter sparade offline." -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "Rapporter skickas till %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "Rapporter skickade till %s, inom området %s" @@ -3438,11 +3467,11 @@ msgstr "Rapporter skickade till %s, inom området %s" msgid "Reports waiting to be sent" msgstr "Rapporter som väntar på att skickas" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "Rapporter kommer automatiskt att skickas utan att en inspektion krävs om användarens anseende är detta värde eller högre. Sätt till 0 om samtliga rapporter måste inspekteras, ovasett användares anseende." -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "Anseendesgräns" @@ -3482,20 +3511,20 @@ msgstr "Svarsmallar" msgid "Response Templates for %s" msgstr "Svarsmallar för %s" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "Återgå till orginalrapporten" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "Återgå till orginalstexten" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "Återgå till orginalsammanfattningen" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Rätt plats?" @@ -3507,15 +3536,15 @@ msgstr "Vägoperatör för den här namngivna vägen (hämtat från vägens numm msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vägoperatör för den här namngivna vägen (från OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rotera åt vänster" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3526,23 +3555,23 @@ msgstr "Rotera åt höger" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rotation av detta foto kommer att radera osparade rapportändringar." -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satellit" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "Spara + stäng som dublett" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Spara ändringar" @@ -3551,12 +3580,12 @@ msgstr "Spara ändringar" msgid "Save new fields" msgstr "Spara nya fält" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "Spara med en offentlig uppdatering" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "Sparar rapporter offline" @@ -3566,7 +3595,8 @@ msgstr "Sparar rapporter offline" msgid "Search Reports" msgstr "Sök rapporter" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Sök användare" @@ -3575,7 +3605,7 @@ msgid "Search reports" msgstr "Sök bland rapporter" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Sök:" @@ -3585,7 +3615,7 @@ msgstr "Sök:" msgid "Searching found no reports." msgstr "Inga rapporter hittades." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Inga användare hittades." @@ -3601,17 +3631,18 @@ msgstr "Säkerhet" msgid "See our privacy policy" msgstr "Se vår integritetsskyddspolicy" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "Se användarinformation för rapporter skapade som kommunen" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Välj en förvaltning" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Välj ett område" @@ -3631,15 +3662,15 @@ msgstr "Välj flera kommuner?" msgid "Select:" msgstr "Välj:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "Skicka" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "Skicka utökade Open311-statusar med Service Request-uppdateringar" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "Skicka inloggningsmejl" @@ -3648,7 +3679,7 @@ msgstr "Skicka inloggningsmejl" msgid "Sending a confirmation text failed: \"%s\"" msgstr "SMS-bekräftelsetexten kunde inte skickas: \"%s\"" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "Skicka tillbaka rapport" @@ -3675,7 +3706,7 @@ msgstr "Tjänst:" msgid "Set password" msgstr "Sätt lösenord" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "Sätt till min nuvarande position" @@ -3684,9 +3715,9 @@ msgid "Share" msgstr "Dela" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "Slutlista" @@ -3694,15 +3725,15 @@ msgstr "Slutlista" msgid "Shortlist all visible" msgstr "Kortlista alla synliga" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "Satt på slutlistan" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "Satt på slutlistan av %s" @@ -3714,7 +3745,7 @@ msgstr "Visa foto?" msgid "Show all updates" msgstr "Visa alla uppdateringar" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Visa mitt namn publikt" @@ -3726,21 +3757,21 @@ msgstr "Visa namn offentligt?" msgid "Show older" msgstr "Visa äldre" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "Visa äldre rapporter" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "Visa foto" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Visa kartnålar" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "Visa rapportörens namn" @@ -3783,8 +3814,8 @@ msgstr "Logga ut" msgid "Some categories may require additional information." msgstr "Vissa kategorier kan kräva ytterligare information." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3801,6 +3832,14 @@ msgstr "Foton från de senaste rapporterna" msgid "Some text to localize" msgstr "Lite text att lokalisera" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Tyvärr, det verkar vara ett postnummer som vi inte täcker." @@ -3818,7 +3857,7 @@ msgstr "Koden var inkorrekt." msgid "Sorry, there has been an error confirming your problem." msgstr "Tyvärr har det uppstått ett fel med att bekräfta ditt problem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3840,7 +3879,7 @@ msgstr "Tyvärr kan vi inte förstå den adressen. Försök gärna igen." msgid "Sorry, we couldn't save your image(s), please try again." msgstr "Tyvärr kan vi inte spara bilden eller bilderna. Försök gärna igen." -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3850,15 +3889,15 @@ msgstr "Anslutningen är inte tillräckligt bra för att hämta den sidan, eller msgid "Sorry, you don't have permission to do that." msgstr "Du har inte rättigheterna som krävs för att göra det." -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "Sortera efter" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "Personalanvändare får logga in på administratörskontrollpanelen." -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "Personal:" @@ -3866,31 +3905,32 @@ msgstr "Personal:" msgid "Start Date" msgstr "Startdatum" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "Tillstånd och externa statuskoder kan inte användas samtidigt." #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "Tillstånd ändrat till:" @@ -3903,14 +3943,14 @@ msgstr "Tillstånd ändrat till:" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "Tillstånd" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3926,7 +3966,7 @@ msgid "Status" msgstr "Status" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "Fortfarande öppen, via enkät" @@ -3939,7 +3979,7 @@ msgstr "Street View" msgid "String" msgstr "Sträng" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "Underkategori" @@ -3947,12 +3987,12 @@ msgstr "Underkategori" msgid "Subdivision/Body" msgstr "Underavdelning/Förvaltning" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Ärende" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Ärende:" @@ -3970,7 +4010,7 @@ msgstr "Skicka" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3991,7 +4031,8 @@ msgstr "Skickad" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Prenumerera" @@ -3999,21 +4040,29 @@ msgstr "Prenumerera" msgid "Subscribe by email" msgstr "Prenumerera med epost" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "Prenumererad:" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "Sammanfatta problemet" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "Sammanfatta dina ändringar" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4033,11 +4082,11 @@ msgstr "Sammanställningsrapporter" msgid "Summary statistics" msgstr "Sammanfattningsstatistik" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "Superanvändare:" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "Superanvändare har rättigheter att utföra samtliga åtgärder i administratörskontrollpanelen." @@ -4055,8 +4104,8 @@ msgstr "Berätta för oss om dig" msgid "Template «%s»" msgstr "Mall «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4066,7 +4115,7 @@ msgstr "Mallar" msgid "Text" msgstr "Text" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Version med endast text" @@ -4110,7 +4159,7 @@ msgstr "Tack, vi är glada över att det har blivit åtgärdat. Har du rapporter msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bilden verkar inte ha laddats upp korrekt (%s), vänligen försök igen." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Den positionen verkar inte täckas av någon kommun och ligger eventuellt utanför kartan eller utanför landet. Försök gärna med en ny position." @@ -4124,11 +4173,11 @@ msgstr "Den positionen verkar inte vara i Sverige: försök gärna igen." msgid "That postcode was not recognised, sorry." msgstr "Det postnummret finns tyvärr inte." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Problemet har markerats som skickat." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Rapportern kommer nu att skickas om." @@ -4140,37 +4189,37 @@ msgstr "Rapporten kan inte visas på %s." msgid "That report has been removed from FixMyStreet." msgstr "Rapporten har tagits bort från FixaMinGata." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "Den användaren har loggats ut." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "Den användaren har gjorts anonym i alla rapporter och uppdateringar." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "Den användarens personliga information har tagits bort." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "Den användarens rapporter och uppdateringar har dolts." -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "E-postadressen är destinationen till vilken rapporter i den här kategorin kommer att skickas. Andra förvaltningskategorier kan ha samma e-postadress." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "Ändpunkten är den webbadress till den tjänst som FixaMinGata kommer att ansluta till när rapporter skickas till den här förvaltningen." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." @@ -4178,17 +4227,17 @@ msgstr "" "Gruppen används för toppnivåkategorifältet när\n" " underkategorigruppering är aktiverat." -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "Jurisdiktion behövs bara om samma ändpunkt används av flera enheter. Om förvaltningen kör sin egen ändpunkt kan du lämna detta fält blankt." -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4198,8 +4247,8 @@ msgstr "Utskicksmetoden avgör hur problemrapporter kommer att skickas till för msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "Open311 v2-attributet agency_responsible används för att lista de administrationer som tagit emot problemrapporten, vilket inte exakt är hur attributet definieras i Open311 v2-specifikationen." -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4214,12 +4263,12 @@ msgstr "Koden används för att spara det här fältvärdet i databasen, t.ex. < msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Fyll i information om problemet nedan. Kommunen kommer inte att kunna hjälpa till om du inte lämnar tillräckligt med detaljer. Beskriv så noga du kan den exakta platsen för problemet (exempelvis \"på väggen\"), vad problemet är, hur länge det har funntis och en beskrivning. Om du har ett foto får du gärna bifoga detta också." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Flitighetstabellen visar redigerares aktiviteter (vem som har ändrat flest handlingar)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Felet var: %s" @@ -4265,7 +4314,7 @@ msgstr "De senaste problemen inom {{NAME}}'s gräns rapporterade av användare" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Länken kan ha gått ut, eller så kanske du inte kopierade och klistrade in den på rätt sätt." -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Listan av tillgängliga områden förses av MapIt-tjänsten på %s." @@ -4286,20 +4335,20 @@ msgstr "Den sökta adressen '%s' hittades inte på denna server" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "Typen av fält som visas för användaren. Text är ett simpelt textfält, List är en rullgardinsmeny." -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "Den uppladdade CSV-filen måste innehålla en rubrikrad, och varje post måste ha följande fält (i denna ordning):" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Användaren kunde inte lokalisera problemet på kartan men angav en area inom vilket problemet finns" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "Användaren har blivit skickad ett inloggningsmejl" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4311,7 +4360,11 @@ msgstr "Användarens namn visas offentligt i rapporter som inte msgid "There are no reports to show." msgstr "Det finns inga rapporter att visa." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "Det finns redan en automatiskt svarsmall för denna kategori eller detta tillstånd." @@ -4319,8 +4372,8 @@ msgstr "Det finns redan en automatiskt svarsmall för denna kategori eller detta msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Det uppstod ett problem med att visa sidan med alla rapporter. Försök gärna igen senare." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen senare." @@ -4342,7 +4395,7 @@ msgstr "Dina inloggningsuppgifter stämde inte. Om du inte kommer ihåg ditt lö msgid "There was a problem with your update. Please try again." msgstr "Det uppstod ett problem med din uppdatering. Försök igen." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Det uppstod ett problem med din rapport. Se nedan." @@ -4359,8 +4412,8 @@ msgstr "Dessa uppgifter kommer att skickas till kommunen, men kommer aldrig att msgid "These details will never be shown online without your permission." msgstr "Dessa uppgifter kommer aldrig att visas på sajten utan ditt tillstånd." -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4369,7 +4422,7 @@ msgid "" " " msgstr "Dessa inställningar är för förvaltningar som använder Open311 (eller någon annan back-end-integrering) för att ta emot problemrapporter.
Du behöver inte sätta dem om utskicksmetoden är e-post.. För mer information om Open311, se den här artikeln." -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "Dessa användare uppdaterades inte." @@ -4387,36 +4440,35 @@ msgstr "Dessa kommer att skickas till %s och publiceras offentl msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Den här API-implementationen är ett pågående arbete och har inte stabiliserats än. Den kommer att förändras." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "Den här förvaltningen är inte associerad med något geografiskt område. Det betyder att den inte kan ha någon jurisdiktion över problem som rapporteras. Följaktligen kommer ingen av dess kategorier att visas i rullgardinsmenyn som visas på problemrapporteringssidan. För närvarende kan problem inte rapporteras till denna förvaltning." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Den här förvaltningen har inga kontakter. Det betyder att problem rapporterade till den här förvaltningen inte kommer att skickas." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "Den här förvaltningen kommer endast att skickas rapporter för problem inom dess geografiska område. En förvaltning kommer inte att få några rapporter om den inte täcker åtminstone ett område." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Det här brevet har skickats till flera adresser eftersom rapportören inte angav någon kategori, eller den kategori som angavs hör till flera olika enheter. Du kan ignorera det här brevet om du inte är rätt person att hantera det, men det vore också mycket hjälpsamt om du kan ta reda på vem som är rätt person och anmäla detta till oss så att vi kan ändra databasen för framtida brev." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Det här brevet har skickats till flera adresser eftersom rapportören inte angav någon kategori, eller den kategori som angavs hör till flera olika enheter. Du kan ignorera det här brevet om du inte är rätt person att hantera det, men det vore också mycket hjälpsamt om du kan ta reda på vem som är rätt person och anmäla detta till oss så att vi kan ändra databasen för framtida brev." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Den här informationen krävs" @@ -4433,7 +4485,11 @@ msgstr "Det här är en utvecklingsplats: olika saker kan komma att gå sönder msgid "This is the public text that will be shown on the site." msgstr "Detta är den offentliga text som kommer att visas på sajten." -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "Den här sidan är ett snabbt sätt att skapa många nya kommunanvändare i ett svep." @@ -4449,12 +4505,16 @@ msgstr "Det här problemet har inte lösts" msgid "This problem is still ongoing" msgstr "Detta problem är fortfarande aktuellt" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "Den här rapporten är en dublett. Lämna uppdateringar på den ursprungliga rapporten:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Den här rapporten väntar på att granskas." @@ -4475,7 +4535,7 @@ msgstr "Den här rapportern är öppen" msgid "This report is now closed to updates." msgstr "Den här rapporten är nu stängd för uppdateringar." -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Länken ovan innehåller också ett foto av problemet." @@ -4486,7 +4546,7 @@ msgstr "Länken ovan innehåller också ett foto av problemet." msgid "Time spent (in minutes):" msgstr "Nedlagd tid (i minuter):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4524,7 +4584,7 @@ msgstr "För att begränsa den här fältgruppen till en specifik FixMyStreet-va msgid "To limit this collection of fields to a single language, select it here." msgstr "För att begränsa den här fältgruppen till ett specifikt språk, välj det här." -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "För att visa en karta med den exakta positionen för problemet" @@ -4553,34 +4613,34 @@ msgstr "Topp 5-kommuner" msgid "Total" msgstr "Totalt" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "Krävs trafikövervakning?" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "Översättning" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "Översättningar" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "Anförtrodd av kommunen:" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "Anförtrodd att skapa rapporter som inte behöver bli inspekterade" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "Anförtrodd:" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Försök igen" @@ -4599,16 +4659,16 @@ msgstr "Tvåfaktorsautentisering av inaktiverats" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "Typ" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "Ta tillbaka förbud" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4626,7 +4686,7 @@ msgstr "Okänd feltyp" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Okänt fel" @@ -4639,7 +4699,7 @@ msgstr "Okänt fel" msgid "Unknown problem ID" msgstr "Okänt problemnummer" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "Okänt uppdaterings-ID" @@ -4652,7 +4712,7 @@ msgid "Up one" msgstr "Upp en" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Uppdatering" @@ -4661,16 +4721,16 @@ msgstr "Uppdatering" msgid "Update %s created for problem %d; by %s" msgstr "Uppdatering %s skapad för rapporten %d, av %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Uppdateringen nedan tillagd anonymt %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Uppdateringen nedan tillagd av %s den %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Uppdatera förvaltning" @@ -4695,7 +4755,7 @@ msgstr "Uppdateringen markerade problemet som löst" msgid "Update reopened problem" msgstr "Uppdateringen öppnade rapporten på nytt" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Uppdaterad status" @@ -4713,14 +4773,14 @@ msgstr "Uppdaterad av %s (%s) %s" msgid "Updated by %s at %s" msgstr "Uppdaterad av %s %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Uppdaterad!" @@ -4745,12 +4805,12 @@ msgstr "Uppdateringar för {{title}}" msgid "Updates to this problem, %s" msgstr "Uppdateringar för det här problemet, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "Användningsanvisningar" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4760,15 +4820,15 @@ msgid "" "as well." msgstr "Använd bekräftad för att indikera att den här kontakten har bekräftats vara korrekt. Om du inte är säker på kontaktens ursprunget eller giltlighet, använd obekräftad. inaktiv kommer att göra så att kategorin inte går att använda när problem rapporteras, men kommer fortsätta att göra kategorin tillgänglig i kartfilter. borttagen å andra sidan kommer att ta bort kategorin även därifrån." -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "Använd Open311-problemhämtning" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "Använd Open311-update-sending-utökningen" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "Använd detta fält för att skriva in uppgifter som endast visas i administratörskontrollpanelen. Informationen visas inte offentligt och kommer inte att skickas till kommunen." @@ -4777,48 +4837,48 @@ msgstr "Använd detta fält för att skriva in uppgifter som endast visas i admi msgid "Used map" msgstr "Använde kartan" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "Användar-ID att attribuera hämtade kommentarer till" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "Användarimport" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "Användaren har lagts till i missbruklistan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "Användaren finns redan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "Användaren finns redan i missbruklistan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Användarflaggan borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Användaren flaggad" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "Användare i missbruktabell" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Användarsökningen matchar mot användares namn och e-postadresser." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "Användarens notifikationer" @@ -4827,20 +4887,20 @@ msgstr "Användarens notifikationer" msgid "User:" msgstr "Användare:" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Användare" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "Användare kan utföra följande åtgärder i deras tilldelade kommun eller område." -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Värden uppdaterade" @@ -4874,12 +4934,12 @@ msgstr "Visa rapporter per område" msgid "View wards" msgstr "Visa kommuner" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "Visa/Markera privata rapporter" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Visa en position" @@ -4914,7 +4974,7 @@ msgstr "Vi har skickat en bekräftelsekod till din telefon. Skriv in den nedan:" msgid "We need your email address, please give it below." msgstr "Skriv in din e-postadress nedan." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Det här problemet kan höra till %s. Dessvärre har vi ingen kontaktinformation till dem. Om du vet om en lämplig kontaktadress hör vi gärna från dig." @@ -4929,8 +4989,8 @@ msgstr "Vi visar upp till tio träffar. Försök med en annan sökning om din in #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Vi kommer endast att använda din information i enlighet med vår sekretesspolicy." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4944,8 +5004,12 @@ msgstr "Webbplats" msgid "We’ll get back to you as soon as we can." msgstr "Vi återkommer så snart vi kan!" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Vid förändringar" @@ -4965,14 +5029,10 @@ msgstr "Huruvida det är obligatoriskt för användaren att ange ett värde för msgid "Which problems do you want alerts about?" msgstr "Vilka problem vill du få information om?" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "Vilken rapport är den en dublett av?" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "Du kan som mest ladda upp tre foton." - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "Varför sluta där? Sätt upp fler notifikationer gratis." @@ -4993,15 +5053,19 @@ msgstr "Vill du bidra till FixaMinGata? Vår kod är öppen programvara och skapa en ny rapport på samma plats." msgid "You can view the problem on this site." msgstr "Du kan se problemet på den här webbplatsen." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Du kan lägga till en elakartade användares e-postadresser i missbrukarlistan, vilket automatiskt döljer (och aldrig skickar) rapporter som användarna skapar." @@ -5052,7 +5115,7 @@ msgstr "Du kan lägga till en elakartade användares e-postadresser i missbrukar msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "Du kan välja att prenumerera på alla problem som rapporteras i detta område, eller baserat på deras mottagare." -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Du kan kontakta teknisk support på %s." @@ -5070,15 +5133,15 @@ msgstr "Du kan flagga rapporter eller användare under dess inställningar, och msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Du kan hjälpa oss med att hitta kontaktadressen för %s och eposta till oss på %s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Du kan markera en förvaltning som borttagen om du inte vill att den skall vara aktiv på sajten." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Du nekade; vänligan fyll i rutan ovan" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "Du har %s sparad att skicka." @@ -5144,7 +5207,7 @@ msgstr "Du har inte satt några rapporter på slutlistan än." msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Du behöver lägga till förvaltningar (som kommuner) innan rapporter kan skickas." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5166,9 +5229,10 @@ msgstr "Ditt konto" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Din epostadress" @@ -5184,10 +5248,10 @@ msgid "Your email or mobile" msgstr "Din epostadress eller ditt mobiltelefonnummer" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Din information kommer endast att användas i enlighet med vår sekretesspolicy" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Ditt namn och efternamn" @@ -5203,7 +5267,7 @@ msgstr "Ditt namn har dolts från alla dina rapporter och uppdateringar." msgid "Your name has been hidden." msgstr "Ditt namn har dolts." -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "Dina offline-rapporter" @@ -5226,7 +5290,7 @@ msgid "Your password should include %d or more characters." msgstr "Ditt lösenord måste inkludera %d eller fler tecken." #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Ditt telefonnummer" @@ -5251,7 +5315,7 @@ msgstr "Din token har genererats" msgid "Your update" msgstr "Din uppdatering" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "Din uppdatering har blivit sparad offline för att skickas när du kommer tillbaka online." @@ -5268,25 +5332,24 @@ msgstr "Din verifieringskod är %s" msgid "Yourself" msgstr "Dig själv" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "en kolonseparerad lista av tillstånd att bevilja den användaren, t.ex. contribute_as_body:moderate:user_edit." -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "administratör" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "samtliga" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "en administratör" @@ -5320,8 +5383,8 @@ msgstr "t.ex. ‘ett 25 cm stort hål i gatan på Storgatan, nära brevlådan’ msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "t.ex. ‘Detta hål har varit här i två månader och...’" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "ändra användare" @@ -5330,12 +5393,12 @@ msgstr "ändra användare" msgid "from %s different users" msgstr "från %s olika användare" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "senast uppdaterad %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "mindre än en minut" @@ -5346,7 +5409,7 @@ msgid "n/a" msgstr "Ej tillgängligt" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "inga" @@ -5386,7 +5449,7 @@ msgstr "ursprungligen inmatat: “%s”" msgid "other areas:" msgstr "andra områden:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "visa" @@ -5394,7 +5457,7 @@ msgstr "visa" msgid "sign out" msgstr "logga ut" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "förvaltningens databas-ID att associera användaren med, t.ex. 148 för Ale kommun." @@ -5411,19 +5474,19 @@ msgstr "det finns ingen kartmarkering eftersom användaren inte använde kartan" msgid "this location" msgstr "den här platsen" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "den här typen av problem" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "idag" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "uppdatering" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "uppdateringar" @@ -5439,11 +5502,11 @@ msgstr "användaren är från samma kommun som problemet - %d" msgid "user is problem owner" msgstr "användaren är inte problemägare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "användare inte i missbruklista" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "användare borttagen från missbruklista" @@ -5452,35 +5515,35 @@ msgstr "användare borttagen från missbruklista" msgid "ward" msgstr "område" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "%d adress" msgstr[1] "%d adresser" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagar" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d timme" msgstr[1] "%d timmar" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minuter" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5494,14 +5557,14 @@ msgid_plural "%d supporters" msgstr[0] "%d supporter" msgstr[1] "%d supportrar" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d vecka" msgstr[1] "%d veckor" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5571,7 +5634,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s uppdatering av rapporter" msgstr[1] "%s uppdateringar av rapporter" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5592,7 +5655,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Vi har ännu ingen information om kommunen på den platsen" msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po index b8b480c52a1..a656293e752 100644 --- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/mysociety/teams/12067/tr_TR/)\n" "Language: tr_TR\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "ve" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "ve" msgid " or " msgstr "veya" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "En çok %d karakter" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr " %s tarafından %d yayına hazırlanır" @@ -48,7 +48,7 @@ msgstr " %s tarafından %d yayına hazırlanır" msgid "%d to %d of %d" msgstr "%d'in %d'den %d'ye" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(duvar yazısı (grafiti), moloz atma, kırık kaldırım döşeme, ya d msgid "(no longer exists)" msgstr "(artık mevcut değil)" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(kurula gönderilmemiş)" @@ -163,11 +163,11 @@ msgstr "(kurula gönderilmemiş)" msgid "(optional)" msgstr "(isteğe bağlı)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(her ikisine de gönderildi)" @@ -176,13 +176,13 @@ msgstr "(her ikisine de gönderildi)" msgid "(we also have RSS feeds for problems within %s)" msgstr "(%s problemi için RSS bildirimimiz var)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Kategori seçiniz--" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "-- Şablon seç--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -206,11 +206,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -235,11 +235,11 @@ msgstr "Hayır Güncellemelerimi e-posta yoluyla onaylamama izi msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -259,8 +259,8 @@ msgstr "" msgid "Add" msgstr "Ekle" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -271,13 +271,13 @@ msgstr "" "gönderilebilir hangi sorun bildirimleri. Her bir birim için bir ya da birden fazla iletişim bilgisi ekleyebilirsiniz (farklı sorun \n" "kategorileri için) " -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Aşağıdaki formu kullanarak iletişim bilgisi ekleyin" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Bölüm ekle" @@ -298,8 +298,8 @@ msgstr "alan ekle" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Yeni kategori ekle" @@ -314,27 +314,27 @@ msgstr "telefon numarası ekle" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "kısa listeye ekle" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Kullanıcı ekle" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "problem kategorisi ekle/düzenle" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -342,7 +342,7 @@ msgstr "" msgid "Added %s" msgstr "Eklenmiş %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -371,7 +371,6 @@ msgstr "Güncellemeleri bildir" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -418,11 +417,15 @@ msgstr "%s ve %s arasındaki tüm bildirimler" msgid "All time" msgstr "her zaman" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -441,9 +444,9 @@ msgid "Anonymous user" msgstr "isimsiz kullanıcı" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Anonim:" @@ -452,29 +455,29 @@ msgstr "Anonim:" msgid "Another user" msgstr "başka kullanıcı" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Kapsadığı alan" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "Burası geçiş sayfası ve %s yanlış olduğu için, bu sayfada yapılan bildirimler, ilgili birimdeki sorumlu kişi yerine problemi bildiren kişiye gönderilecektir." @@ -495,11 +498,11 @@ msgstr "Dışarıdan bir organ atamak:" msgid "Assign to subdivision:" msgstr "Alt bölüm atamak:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "%s atamak" @@ -511,8 +514,8 @@ msgstr "En çok geri dönen %d talepler sorgulama neticesinde geri dönmüştür msgid "At the moment only searching for and looking at reports work." msgstr "Şu an sadece arama ve raporlara göz atma kısımları çalışıyor." -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -528,7 +531,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -549,11 +552,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "Denetleme bekliyor" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Geri" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -561,10 +564,10 @@ msgstr "" msgid "Ban user" msgstr "kullanıcıyı yasakla" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -573,17 +576,17 @@ msgstr "Bölümler" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Bölüm" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Bölüm:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -599,7 +602,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Haritayı göremiyor musunuz? Bu adımı atlayın" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -610,15 +613,15 @@ msgstr "kategoriler" msgid "Categories:" msgstr "Kategoriler:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -631,7 +634,7 @@ msgstr "Kategori" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -641,9 +644,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "Bu kategori için problemlerin onarılma süresi > 4 hafta" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -670,11 +673,11 @@ msgstr "Şifreyi değiştir" msgid "Change phone number" msgstr "telefon numarasını değiştir" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -691,7 +694,7 @@ msgstr "" "Bu kullanıcının ilgili birime bildirimde bulunmasına izin vermek istediğiniz konular için uygundur, gizli olanlar hariç. İngiltere'de, ekstra çöp kutusu talebi gibi hizmetlerde bunu daha önce kullanmıştık\n" "belirli bir adres için." -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." @@ -699,11 +702,11 @@ msgstr "" "Herkes tarafından kolay anlaşılabilecek bir kategori ismi seçin (ör: \"çukur\", \"sokak lambası\") aynı zamanda birime de\n" "yardımcı olacak. Bunlar problem-bildir sayfasındaki açılan menüde görüntülenecektir." -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -735,9 +738,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -781,17 +788,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Yapılandırma" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Onayla" @@ -812,9 +819,9 @@ msgstr "" msgid "Confirmation" msgstr "Onay" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Onaylandı" @@ -844,7 +851,11 @@ msgstr "Grupla bağlantı kur" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -853,12 +864,12 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Kullanıcı bulunamadı" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Konuma bakılamadı" @@ -866,9 +877,11 @@ msgstr "Konuma bakılamadı" msgid "Council" msgstr "Kurul" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Kurula ulaşmak için %s" @@ -897,8 +910,8 @@ msgstr "Bildiri oluştur" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Kategori oluştur" @@ -906,15 +919,15 @@ msgstr "Kategori oluştur" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -928,7 +941,7 @@ msgstr "" msgid "Created" msgstr "Oluşturuldu" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -951,12 +964,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Şu anda hiçbir organları oluşturulmamıştır." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -984,32 +997,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Silindi" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1025,18 +1038,18 @@ msgstr "Tanım" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Detaylar" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1047,7 +1060,7 @@ msgstr "Detaylar:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Devredildi" @@ -1056,24 +1069,24 @@ msgstr "Devredildi" msgid "Didn't use map" msgstr "" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Özenle hazırlanmış işbirliği tablosu" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1082,7 +1095,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1090,7 +1103,7 @@ msgstr "" msgid "Don’t know" msgstr "Don’t know" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Şekilleri beğenmediniz mi?" @@ -1098,19 +1111,19 @@ msgstr "Şekilleri beğenmediniz mi?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1118,8 +1131,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1127,23 +1140,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Ekle" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Bölümün detaylarını düzenle" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1151,15 +1164,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1182,28 +1195,28 @@ msgstr "Sorunu düzenleme %d" msgid "Editing update %d" msgstr "Güncellemeleri düzenleme %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Eklenen kullanıcı %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Editör" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "E-posta" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1232,37 +1245,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "E-posta:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1270,8 +1283,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1283,16 +1296,16 @@ msgstr "" "Daha fazla bilgi için bakınız\n" " this article." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1300,7 +1313,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Varılan nokta" @@ -1322,10 +1335,6 @@ msgstr "Yakınlardaki bir posta kodu, cadde veya bölge ismi giriniz" msgid "Enter a nearby street name and area" msgstr "Yakınlardaki bir cadde ve bölge ismi giriniz" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Problem hakkında detaylı bilgi giriniz" @@ -1339,13 +1348,13 @@ msgstr "Problem hakkında detaylı bilgi giriniz" msgid "Error" msgstr "Hata" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Örnek postakodu " @@ -1357,11 +1366,11 @@ msgstr "Örnekler:" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1378,7 +1387,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "Harici URL " @@ -1399,25 +1408,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "İlave veriler:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1440,11 +1449,12 @@ msgstr "" msgid "Filter report list" msgstr "Bildiri listesini filtrele" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "İlk kez" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" @@ -1464,9 +1474,9 @@ msgstr "Sorun çözüldü- Kurul" msgid "Fixed - User" msgstr "Sorun çözüldü- Kullanıcı" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Silindi olarak seçildi" @@ -1474,8 +1484,8 @@ msgstr "Silindi olarak seçildi" msgid "Flag user" msgstr "Kullanıcıyı seç" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Seçildi" @@ -1483,7 +1493,7 @@ msgstr "Seçildi" msgid "Flagged reports and users" msgstr "Seçilen bildirimler ve kullanıcılar" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Seçilen kullanıcılar etiketlilersayfasında listelendi." @@ -1492,7 +1502,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Seçilen kullanıcılar hiç bir şekilde kısıtlanmamıştır. Bu sadece dikkate alınmak üzere işaretlenen kullanıcıların listesidir." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Seçilenler:" @@ -1508,7 +1518,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Daha fazla bilgi için, bakınız FixMyStreet'in Mapit'i nasıl kullandığını." @@ -1522,11 +1532,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Şifrenizi mi unuttunuz?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1542,6 +1552,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Güncellemeleri yap" @@ -1572,9 +1584,9 @@ msgstr "Problemin çözüldüğünü duymak güzel" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1584,7 +1596,7 @@ msgstr "Git" msgid "Going to send questionnaire?" msgstr "Anket gönderecek misiniz?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1592,7 +1604,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Zamanla oluşan problemlerin duruma göre grafikleri" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1643,11 +1655,11 @@ msgstr "Gizli" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1668,9 +1680,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "İğneler gizle" @@ -1687,11 +1699,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Tarihçe" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Anasayfa" @@ -1699,7 +1711,7 @@ msgstr "Anasayfa" msgid "How to report a problem" msgstr "Bir problem nasıl bildirilir" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Başarılı bildirim nasıl gönderilir" @@ -1721,7 +1733,7 @@ msgstr "Maalesef veri tabanında sorunun yerini bulamadık.\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1730,8 +1742,8 @@ msgstr "Maalesef veri tabanında sorunun yerini bulamadık.\n" msgid "ID" msgstr "Kimlik" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1753,13 +1765,13 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1771,6 +1783,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Sorununuzun durumu ile ilgili daha fazla bilgi almak istiyorsanız, lütfen ana sayfaya geri dönün ve bir güncelleme bırakın." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1798,34 +1814,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Kanunsuz kimlik " @@ -1833,7 +1849,7 @@ msgstr "Kanunsuz kimlik " msgid "Illegal feed selection" msgstr "Yasadışı bildirim seçimi" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1845,7 +1861,7 @@ msgstr "Gereksiz bölümüne atılsın mı?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1861,15 +1877,15 @@ msgstr "Bildiren kişinin kişisel bilgilerini dahil et" msgid "Incorrect has_photo value \"%s\"" msgstr "Hatalı sahip_fotoğraf değer \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1877,7 +1893,7 @@ msgstr "" msgid "Internal notes" msgstr "İç notlar" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1885,12 +1901,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Geçersiz ajans_sorumlu değer %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Geçersiz format %s belirlenmiş." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "Geçersiz konum. Aynı konsil tarafından yeni konum girilmeli." @@ -1911,7 +1927,7 @@ msgstr "Anahtar" msgid "Label" msgstr "Etiket" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "Dil" @@ -1924,8 +1940,8 @@ msgstr "Diller" msgid "Last 7 days" msgstr "Son 7 gün" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Son düzenleyen" @@ -1941,17 +1957,17 @@ msgstr "Son güncelleme:" msgid "Last update:" msgstr "Son güncelleme:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Eğerbu birime bürün bildirimler aynı gönderme yöntemi ile yapılacak ise burayı boş bırakın (ör., \"%s\")." @@ -1959,7 +1975,7 @@ msgstr "Eğerbu birime bürün bildirimler aynı gönderme yöntemi ile yapıla msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Bildirilmiş problemleri güncelle" @@ -2003,16 +2019,16 @@ msgstr "Facebook ile giriş yap" msgid "Log in with Twitter" msgstr "Twitter ile giriş yap" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2020,23 +2036,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "HARİTA" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "Harita" @@ -2044,15 +2060,15 @@ msgstr "Harita" msgid "Mark as sent" msgstr "Gönderildi olarak işaretle" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "İleti" @@ -2068,19 +2084,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Eksik yetki_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2088,10 +2104,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2109,12 +2125,12 @@ msgstr "" msgid "Month" msgstr "Ay" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2126,11 +2142,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2139,7 +2155,7 @@ msgstr "İsim" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "İsim:" @@ -2149,11 +2165,11 @@ msgstr "İsim:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2165,7 +2181,7 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" @@ -2189,11 +2205,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Yeni bölüm eklendi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Yeni kategori bilgisi eklendi" @@ -2229,23 +2245,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2253,7 +2269,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2289,11 +2305,11 @@ msgstr "Yeni durum" msgid "New template" msgstr "" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2305,10 +2321,10 @@ msgstr "Sonraki" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2316,11 +2332,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Hayır" @@ -2328,11 +2343,7 @@ msgstr "Hayır" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Birim yok" @@ -2340,7 +2351,7 @@ msgstr "Birim yok" msgid "No council selected" msgstr "Seçilmiş kurul yok" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Şuana kadar herhangi bir ekleme yapılmadı." @@ -2357,11 +2368,11 @@ msgstr "İşaretlenen kullanıcılar bulunamadı." msgid "No further updates" msgstr "Güncelleme yok" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2369,12 +2380,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Herhangi bir geri dönüş olmamıştır" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2391,15 +2402,15 @@ msgstr "Destek sağlayıcı yok" msgid "None" msgstr "Hiçbiri" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2419,13 +2430,13 @@ msgstr "Daha önce bildirilmedi" msgid "Not reported to council" msgstr "Kurula bildirilmemiş" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Not" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Not:" @@ -2449,15 +2460,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "Tamam" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2465,16 +2476,16 @@ msgstr "" msgid "Old state" msgstr "Eski durum" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2485,7 +2496,7 @@ msgstr "" msgid "Open" msgstr "Aç" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2493,7 +2504,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "mySociety FixMyStreet sunucusu için Open311 API " -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2525,17 +2536,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Diğer" @@ -2560,8 +2571,8 @@ msgstr "Sahibi" msgid "Page Not Found" msgstr "Sayfa bulunamadı" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Ebeveyn" @@ -2575,19 +2586,19 @@ msgstr "Kısmi" msgid "Password (optional)" msgstr "Şifre (isteğe bağlı)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2607,17 +2618,16 @@ msgstr "Telefon numarası (isteğe bağlı)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Telefon:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2628,6 +2638,7 @@ msgstr "Telefon:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2642,7 +2653,7 @@ msgstr "Fotoğraf" msgid "Photo is required." msgstr "" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "" @@ -2671,11 +2682,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Harita üzerine işaretleyin" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Kibar, açık ve hedef odaklı olun." @@ -2692,7 +2707,7 @@ msgstr "Şifreyi kontrol ediniz ve tekrar deneyiniz" msgid "Please check your email address is correct" msgstr "E-posta adresinizin doğruluğunu kontrol ediniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2700,11 +2715,11 @@ msgstr "E-posta adresinizin doğruluğunu kontrol ediniz" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Kategori seçiniz" @@ -2713,8 +2728,9 @@ msgstr "Kategori seçiniz" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Lütfen aşağıdaki hataları düzeltiniz" @@ -2730,13 +2746,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Mesaj giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2744,90 +2760,90 @@ msgstr "Mesaj giriniz" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Şifre giriniz" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Konu giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Geçerli e-posta giriniz" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Geçerli e-posta adresi giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Lütfen bir kaç ayrıntı giriniz" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "E-posta giriniz" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Ad giriniz" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Lütfen adınızı ve soyadınızı giriniz, kurullar için gereklidir – eğer isminizin sitede kullanılmasını istemiyorsanız, aşağıda bulunan kutucuktan tiki kaldırınız." -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Lütfen isminizi giriniz" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Lütfen telefon numaranızı gririniz" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Soyad giriniz" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Konu başlığı giriniz" @@ -2855,7 +2871,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Başka bir anket doldurmak istediğinizi belirtiniz." #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2881,11 +2897,11 @@ msgstr "" msgid "Please note:" msgstr "Lütfen dikkat:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2921,16 +2937,16 @@ msgstr "Problemin giderilmiş veya giderilmemiş olması durumunu bildiriniz lü #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Mesaj gönderin" @@ -2966,12 +2982,12 @@ msgstr "" msgid "Previous" msgstr "Önceki" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2985,14 +3001,18 @@ msgstr "Gizlilik" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Özel" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Sorun" @@ -3015,7 +3035,7 @@ msgstr "Problem %s kurula gönderildi %s" msgid "Problem breakdown by state" msgstr "Sorun devlet tarafından meydana gelmiştir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Problem çözülmemiş olarak işaretlenmiştir." @@ -3023,7 +3043,7 @@ msgstr "Problem çözülmemiş olarak işaretlenmiştir." msgid "Problem state change based on survey results" msgstr "Araştırma sonucu göz önünde bulundurularak problemin durumundaki değişim" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Sorunlar" @@ -3048,7 +3068,7 @@ msgstr "FixMyStreet'te kısa bir süre önce onarıldı olarak bildirilen proble msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3073,8 +3093,8 @@ msgstr "" msgid "Property address:" msgstr "Emlak adresi:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Güncellemeye izin ver" @@ -3100,7 +3120,7 @@ msgstr "" msgid "Public response:" msgstr "Toplumsal geri bildirim:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3125,6 +3145,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "%d sorunu için gönderilen %d anket" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Anket sorun bildirici tarafından dolduruldu" @@ -3148,11 +3169,11 @@ msgstr "%s için %s gözetiminde RSS besleme" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "%s için RSS besleme" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "%s içinde %s gözetimiyle RSS besleme" @@ -3160,7 +3181,7 @@ msgstr "%s içinde %s gözetimiyle RSS besleme" msgid "RSS feed of nearby problems" msgstr "Civardaki problemlerle alakalı RSS besleme" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3180,6 +3201,14 @@ msgstr "Son günlerdeki yerel problemlerle alakalı RSS besleme" msgid "RSS feed of updates to this problem" msgstr "Bu problemin güncellemelerini RSS olarak besle" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3199,11 +3228,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Yakın zamanda bildirilen problemler" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3215,7 +3244,7 @@ msgstr "Şehir Dedektifi uygulamasının temel amacının, kamusal alanlardaki a msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3229,9 +3258,9 @@ msgstr "İşareti kaldır" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3257,20 +3286,20 @@ msgstr "" msgid "Report" msgstr "Bildirim" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Bir problem bildir" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3280,7 +3309,7 @@ msgstr "" msgid "Report abuse" msgstr "Kötüye kullanım bildir" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3314,17 +3343,18 @@ msgid "Report, view, or discuss local problems" msgstr "Yerel problemleri bildir, göster ve tartış" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "%s 'e ananim olarak bildirilmiş" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Önceden bildirilmiş" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "%s tarafından %s de bildirilmiştir" @@ -3368,28 +3398,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Bir problemin bildirilmesi" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Bildirimler" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Bildirimler %s karakter olarak sınırlıdır. Bildiriminizi kısaltınız lütfen" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3401,7 +3431,7 @@ msgstr "Onay bekleyen bildirimler" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3413,15 +3443,15 @@ msgstr "" msgid "Reports published" msgstr "Yayınlanmış bildirimler" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3429,11 +3459,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3473,20 +3503,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Doğru yer mi?" @@ -3498,15 +3528,15 @@ msgstr "Bu isimli yol için yol operatörü (yol referans numarası ve türünde msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Bu isimli yol için yol operatörü (OpenStreetMap'ten): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Sola Yerleştir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3517,23 +3547,23 @@ msgstr "Sağa Yerleştir" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Uydu" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Değişiklikleri kaydet" @@ -3542,12 +3572,12 @@ msgstr "Değişiklikleri kaydet" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3557,7 +3587,8 @@ msgstr "" msgid "Search Reports" msgstr "Bildirimleri ara" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Kullanıcı Ara" @@ -3566,7 +3597,7 @@ msgid "Search reports" msgstr "Bildirimleri ara" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Ara:" @@ -3576,7 +3607,7 @@ msgstr "Ara:" msgid "Searching found no reports." msgstr "Aranan sonuç bulunamadı." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Arama sonucu kullanıcı bulunamadı" @@ -3592,17 +3623,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Bir bölüm seç" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Bölge seç" @@ -3622,15 +3654,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3639,7 +3671,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3666,7 +3698,7 @@ msgstr "Hizmet:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3675,9 +3707,9 @@ msgid "Share" msgstr "Paylaş" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3685,15 +3717,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3705,7 +3737,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "İsmimi açıkça göster " @@ -3717,21 +3749,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "İşaretlemeleri göster" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3774,8 +3806,8 @@ msgstr "Çıkış" msgid "Some categories may require additional information." msgstr "Bazı kategoriler ek bilgiler gerektirebilir." -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3790,6 +3822,14 @@ msgstr "Son bildirimlerden bazı fotograflar" msgid "Some text to localize" msgstr "Konumun belirlenebilmesi için tarif" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Üzgünüz, bu posta kodu bizim sınırlarımız dışında yer almaktadır." @@ -3807,7 +3847,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Üzgünüz, sorununuzu onaylarken bir hata oluştu." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3829,7 +3869,7 @@ msgstr "Üzgünüz, konum ayrıştırılamadı. Daha sonra tekrar deneyin." msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3839,15 +3879,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3855,31 +3895,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Devlet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3892,14 +3933,14 @@ msgstr "" msgid "State:" msgstr "Devlet:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3915,7 +3956,7 @@ msgid "Status" msgstr "Durum" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3928,7 +3969,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3936,12 +3977,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Alt bölüm/Bölüm" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Konu" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Konu:" @@ -3959,7 +4000,7 @@ msgstr "Kaydet" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3980,7 +4021,8 @@ msgstr "Kaydedildi" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Kaydet" @@ -3988,21 +4030,29 @@ msgstr "Kaydet" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4022,11 +4072,11 @@ msgstr "Özet bildirimler" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4044,8 +4094,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4055,7 +4105,7 @@ msgstr "" msgid "Text" msgstr "Metin" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Salt metin sürümü " @@ -4099,7 +4149,7 @@ msgstr "Teşekkürler, sorunun hallolduğuna sevindim. Bu sorunu daha önce herh msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bu şekilde resim doğru yüklemiş gibi görünmüyor (%s), lütfen tekrar deneyin." -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Bu konuma bir kurul tarafından ele alınacak gibi görünmüyor; belki de deniz ya da ülke dışındadır. Lütfen tekrar deneyin." @@ -4113,11 +4163,11 @@ msgstr "Konum İngiltere'de görünmüyor; lütfen tekrar deneyin." msgid "That postcode was not recognised, sorry." msgstr "Üzgünüz, bu posta kodu bulunamadı." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "Problem gönderildi olarak işaretlenmiştir." -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Bu problem yeniden gönderilecektir." @@ -4129,53 +4179,53 @@ msgstr "Bu bildirim %s 'te görüntülenemiyor" msgid "That report has been removed from FixMyStreet." msgstr "Bu bildirim FixMyStreet'ten kaldırılmışır." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "e-posta adresi bu kategoriye hangi bildirimlerin gönderileceğinin adresidir. Bu bölüm için diğer kategoriler aynı e-posta adresine sahiptir." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "son aşama FixMyStreet'in, o birime gönderilen bildirimlerin bulunduğu sayfanın link'idir." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4185,8 +4235,8 @@ msgstr "gönderme yöntemi sorunun bildiriminin birime nasıl g msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4201,12 +4251,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Başarı ödül tablosu editörün faaliyetlerini göstermektedir (kimin en fazla kayıt düzenlediği)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Hata buydu: %s" @@ -4252,7 +4302,7 @@ msgstr "Kullanıcı tarafından bildirilen {{NAME}} sınırları içindeki en so msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "Ulaşılabilir bölgelerin listesi %s'teki Mapit hizmeti tarafından sağlanmaktadır." @@ -4273,20 +4323,20 @@ msgstr "Talep edilen URL '%s' bu sunucuda bulunamadı " msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Kullanıcı sorunu harşta üzerinde konumlandıramadı ama onların girdiği bölgenin etrafındaki konumları görmek için." -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4298,7 +4348,11 @@ msgstr "Kullanıcının ismi anonim o msgid "There are no reports to show." msgstr "Gösterilecek hiçbir rapor yok." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4306,8 +4360,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Tüm Bildirimlerin görüntülendiği sayfada bir sorun var. Lütfen daha sonra tekrar deneyin." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Bu sayfa görüntülenirken bir sorun oluştu. Lütfen daha sonra tekrar deneyin." @@ -4329,7 +4383,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Güncelleme esnasında bir hata oluştu. Lütfen tekrar deneyiniz." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Bildiriminiz esnasında hata oluştu. Lütfen aşağıya bakınız." @@ -4346,8 +4400,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4356,7 +4410,7 @@ msgid "" " " msgstr "Bu ayarlar Open311 (veya diğer back-end integration) problemini kapsayan ve
bildirimlerin ulaşacağı birimlerin kullanılması içindir. Open311 hakkında daha fazla bilgi içinbu makale bakınız." -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4374,36 +4428,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Bu API uygulaması çalıştırılma aşamadındadır ve henüz stabilize edilmemiştir." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "Bu birim hiçbir bölgeyi kapsamamaktadır. Bu bildirilen raporlar üzerinde hiçbir konum için yetkisi olmadığı anlamı taşımaktadır. Kısaca bu kategorilerden hiçbiri kullanıcı problem bildirildiğinde drop-down kategorisinde görüntülenmeyecektir." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "Bu bölüm herhangi bir iletişim bilgisine sahip değil. Yani bu bölüme bildirilen problemler gönderilmeyecek." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "Bu birime sadece alanda yer alan ve konuyu kapsayan bildirimler gönderilebilecektir. Bu birime bu iki maddeden herhangi birini kapsamayan bildirimler ulaşmayacaktır." -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Kullanıcının problemi sınıflandırmama durumunda, bu e-posta problemin konumunu kapsayacak iki kurula da gönderilir. Eğer problemle ilgilenecek olan doğru kurul değil iseniz, bu bildirimi dikkate almayınız veya problemin hangi kategoriyle olduğunu bize bildirin ki biz de sistemimizde doğru kurula yönlendirelim." -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Bu e-posta problemin konumunu kapsayan çeşitli kurullara gönderilmiştir. Seçilmiş kategori kurulun yetki alanı dışındaysa, bu sorunu dikkate almayın." #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Bu bilgi gereklidir" @@ -4420,7 +4473,11 @@ msgstr "Burası gelişen bir sitedir, her an çökebilir ve veritabanı belli ar msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4436,12 +4493,16 @@ msgstr "Bu problem giderilemedi" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Bu rapor işlenmeyi bekliyor." @@ -4462,7 +4523,7 @@ msgstr "Bu rapor şu an açık olarak işaretlenmiş." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Bu internet sitesine problemin fotoğrafı da kullanıcı tarafından eklenmiştir. " @@ -4473,7 +4534,7 @@ msgstr "Bu internet sitesine problemin fotoğrafı da kullanıcı tarafından ek msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zaman çizelgesi" @@ -4511,7 +4572,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "Bu konudaki kesin lokasyonu haritasını göstermek için" @@ -4540,34 +4601,34 @@ msgstr "" msgid "Total" msgstr "Toplam" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Tekrar dene" @@ -4586,16 +4647,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4613,7 +4674,7 @@ msgstr "Bilinmeyen uyarı tipi" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Bilinmeyen hata" @@ -4626,7 +4687,7 @@ msgstr "Bilinmeyen hata" msgid "Unknown problem ID" msgstr "Bilinmeyen ID problemi" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4639,7 +4700,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Güncelleme" @@ -4648,16 +4709,16 @@ msgstr "Güncelleme" msgid "Update %s created for problem %d; by %s" msgstr " %d problem için %s tarafından oluşturulmuş %s güncelle" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Aşağıdaki anonim olarak %s 'e ekleneni güncelle" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Aşağıda %s tarafıdan %s 'e ekleneni güncelle" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Bölümü güncelle" @@ -4682,7 +4743,7 @@ msgstr "İşaretlenmiş problemi onarıldı olarak güncelle" msgid "Update reopened problem" msgstr "Tekrardan değerlendirilen problemi güncelle" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Güncelleme durumu" @@ -4700,14 +4761,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Güncellendi!" @@ -4732,12 +4793,12 @@ msgstr "{{title}} daki güncellemeler" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4747,15 +4808,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4764,48 +4825,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Kullanıcı etiketi kaldırıldı" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Kullanıcı etiketlendi" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Arama sonuçları kullanıcı adı ve e-posta adresi ile uyumludur." -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4814,20 +4875,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Kullanıcılar" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Değerler güncellendi" @@ -4861,12 +4922,12 @@ msgstr "Semte göre bildirimleri görüntüle" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Bir konum görüntülemek" @@ -4901,7 +4962,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Bu problemin %s sorumluluğunda olduğunun farkındayız; ancak, şu anda irtibat bilgilerine sahip değiliz. Eğer uygun irtibat adresini biliyorsanız, bizimle iletişime geçin." @@ -4916,8 +4977,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Kişisel bilgileriniz sadece bizim gizlilik politikası uyumluluğu çerçevesinde kullanılacaktır" +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4931,8 +4992,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "Mümkün olan en kısa sürede size dönüş yapacağız." -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Yayınlandığında" @@ -4952,14 +5017,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "Neden devam etmiyorsun? Ücretsiz olarak daha fazla uyarı ekle." @@ -4980,15 +5041,19 @@ msgstr "FixMyStreet'e katkıda bulunmak ister misin? Şifremiz herkese açıktı msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Durumunu kontrol etmek için 4 hafta sonra bir anket yolu ile hatırlatma ister misiniz?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Gönderdiğin bildiriminin kalıp halinde ve eksik noktalama işaretleri ile olması, okumayı zorlaştırıyor." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4997,20 +5062,19 @@ msgstr "Gönderdiğin bildiriminin kalıp halinde ve eksik noktalama işaretleri #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Evet" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Bu problem bildirimini gereksiz bir şekilde yönetildiği için şikayet ediyorsun:" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "Çevrimdışısınız" @@ -5018,7 +5082,7 @@ msgstr "Çevrimdışısınız" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "Aşağıdaki kişisel bilgi veya benzeri kötü niyetli raporları içeren sorunları bildiriyorsun: " -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Aşağıdaki kişisel bilgi veya benzeri kötü niyetli raporları içeren güncellemeleri bildiriyorsun: " @@ -5031,7 +5095,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Problemi bu site üzerinde görüntüleyebilir siniz." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Kötü niyetli bir kullanıcının e-postasını otomatik olarak gizlenen (ve asla gönderilmeyen) raporların bulunduğu kara listeye ekleyebilirsiniz." @@ -5039,7 +5103,7 @@ msgstr "Kötü niyetli bir kullanıcının e-postasını otomatik olarak gizlene msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Teknik destek için %s iletişime geçebilirsiniz." @@ -5059,15 +5123,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "Lokal problemler için bize iletişim kurabileceğimiz e-posta adresi bularak bize yardımcı olabilirsiniz %s için ve bize %spostalayarak." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Eğer bir bölümü sitede aktif olarak bulunsun istemiyorsanız, silindi olarak işaretleyebilir siniz." -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Kabul etmediniz; lütfen yukardaki kutuyu doldurun" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5133,7 +5197,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Rapor gönderilmeden öncebazı bölümler (örneğin kurullar veya bölge müdürlüğü) eklenmeli. " -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5155,9 +5219,10 @@ msgstr "Hesabınız" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "E-posta adresiniz" @@ -5173,10 +5238,10 @@ msgid "Your email or mobile" msgstr "E-postanız ya da cep telefonunuz" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Bilgileriniz sadece bizim gizlilik politikası uyumluluğu çerçevesinde kullanılacaktır" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Adınız" @@ -5192,7 +5257,7 @@ msgstr "İsminiz tüm rapor ve güncellemelerde gizlendi." msgid "Your name has been hidden." msgstr "İsminiz gizlendi." -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "Çevrimdışı raporlarınız" @@ -5215,7 +5280,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Telefon numaran" @@ -5240,7 +5305,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5257,25 +5322,24 @@ msgstr "onay kodunuz %s" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "tümü" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5309,8 +5373,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "kullanıcı düzenle" @@ -5319,12 +5383,12 @@ msgstr "kullanıcı düzenle" msgid "from %s different users" msgstr " %s farklı kullanıcılardan" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "son güncelleme %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "bir dakikadan az" @@ -5335,7 +5399,7 @@ msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "hiçbiri" @@ -5375,7 +5439,7 @@ msgstr "özgün giriş: “%s”" msgid "other areas:" msgstr "diğer bölgeler:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5383,7 +5447,7 @@ msgstr "" msgid "sign out" msgstr "çıkış yap" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5400,19 +5464,19 @@ msgstr "Kullanıcı haritayı kullanmadığından herhangi bir işaret görünm msgid "this location" msgstr "bu konum" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "bu tip lokal problem" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "bugün" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "güncelleme" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "güncellemeler" @@ -5428,11 +5492,11 @@ msgstr "kullanıcının problemi - %d kuruldaki problemle aynı" msgid "user is problem owner" msgstr "kullanıcı problemin sahibi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5441,35 +5505,35 @@ msgstr "" msgid "ward" msgstr "bölge" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "%d adres" msgstr[1] "%d adres" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d gün" msgstr[1] "%d gün" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d saat" msgstr[1] "%d saat" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d dakika" msgstr[1] "%d dakika" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5483,14 +5547,14 @@ msgid_plural "%d supporters" msgstr[0] "%d destekçiler" msgstr[1] "%d destekçiler" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d hafta" msgstr[1] "%d hafta" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5560,7 +5624,7 @@ msgid_plural "%s updates on reports" msgstr[0] "%s bildirimlerin güncellemeleri" msgstr[1] "%s bildirimlerin güncellemeleri" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5581,7 +5645,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] " Bahsettiğiniz alanı kapsayan ilgili kurul hakkında detaylı bilgimiz yok." msgstr[1] " Bahsettiğiniz alanı kapsayan ilgili kurul hakkında detaylı bilgimiz yok." -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po index 2ee1e76ef53..2877cdfbc04 100644 --- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Ukrainian (Ukraine) (https://www.transifex.com/mysociety/teams/12067/uk_UA/)\n" "Language: uk_UA\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "і" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "і" msgid " or " msgstr "або" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr "%d редагувань від %s" @@ -48,7 +48,7 @@ msgstr "%d редагувань від %s" msgid "%d to %d of %d" msgstr "%d до %d з %d" -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -154,7 +154,7 @@ msgstr "(графіті, сміття, крива бруківка, пробле msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "(не відправлено муніципалітету)" @@ -163,11 +163,11 @@ msgstr "(не відправлено муніципалітету)" msgid "(optional)" msgstr "(вибірково)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "(відправлено обидвом)" @@ -176,13 +176,13 @@ msgstr "(відправлено обидвом)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "-- Оберіть категорію --" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -190,8 +190,8 @@ msgstr "" msgid "--Choose a template--" msgstr "--Оберіть шаблон--" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -206,11 +206,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -235,11 +235,11 @@ msgstr "Ні Я підтверджу поновлення е-ma msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -259,21 +259,21 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" " categories of problem) to each body." msgstr "Додайте запис для кожної адміністративної одиниці, ради чи департаменту, яким можна надсилати сповіщення. Ви можете додати один або більше контактів (для різних категорій проблем) для кожного запису." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "Додати контакт через форму нижче." -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "Додати запис" @@ -294,8 +294,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "Додати нову категорію" @@ -310,27 +310,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "Додати до переліку" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "Додати користувача" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "Додати/редагувати категорію" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "Додати/редагувати пріоритет відповіді" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "Додати/редагувати шаблон відповіді" @@ -338,7 +338,7 @@ msgstr "Додати/редагувати шаблон відповіді" msgid "Added %s" msgstr "Додано %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -367,7 +367,6 @@ msgstr "Повідомляти мене про оновлення" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -414,11 +413,15 @@ msgstr "Всі звіти в проміжку з %s по %s" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -437,9 +440,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "Анонім:" @@ -448,29 +451,29 @@ msgstr "Анонім:" msgid "Another user" msgstr "Інші користувачі" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "Ви впевнені, що хочете скасувати завантаження?" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Ви впевнені?" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "Зона покрита" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -491,11 +494,11 @@ msgstr "Назначити зовнішньому відділу:" msgid "Assign to subdivision:" msgstr "Назначити підрозділу:" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "Назначити %s" @@ -507,8 +510,8 @@ msgstr "At most %d requests are returned in each query. The returned requests a msgid "At the moment only searching for and looking at reports work." msgstr "Наразі лише роздивляюсь як працюють звіти" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -524,7 +527,7 @@ msgstr "Автоматична відповідь:" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -545,11 +548,11 @@ msgstr "Уникайте особистої інформації та номер msgid "Awaiting moderation" msgstr "Очікує перевірки модератором" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "Назад" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "Повернутися до всіх звітів" @@ -557,10 +560,10 @@ msgstr "Повернутися до всіх звітів" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -569,17 +572,17 @@ msgstr "Органи" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "Орган" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "Орган:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -595,7 +598,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Не бачите мапу? Пропустіть цей крок" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -606,15 +609,15 @@ msgstr "Категорії" msgid "Categories:" msgstr "Категорії:" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -627,7 +630,7 @@ msgstr "Категорія" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Категорія змінена з ‘%s’ на ‘%s’" @@ -637,9 +640,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "В цій категорії проблеми не вирішуються > 4 тижнів" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -666,11 +669,11 @@ msgstr "Змінити пароль" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -681,17 +684,17 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -723,9 +726,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -769,17 +776,17 @@ msgstr "Cobrand:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфігурація" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "Підтвердити" @@ -800,9 +807,9 @@ msgstr "" msgid "Confirmation" msgstr "Підтвердження" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "Підтверджено" @@ -832,7 +839,11 @@ msgstr "Звернутись до команди" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -841,12 +852,12 @@ msgstr "" msgid "Coordinates:" msgstr "Координати:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "Не вдалось знайти користувача" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "Не вдалось встановити локацію" @@ -854,9 +865,11 @@ msgstr "Не вдалось встановити локацію" msgid "Council" msgstr "Рада" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "Контакти ради для %s" @@ -885,8 +898,8 @@ msgstr "Створити сповіщення" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "Створити категорію" @@ -894,15 +907,15 @@ msgstr "Створити категорію" msgid "Create priority" msgstr "Створити приоритет" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "Створити звіт/оновлення для ради" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -916,7 +929,7 @@ msgstr "Створити шаблон" msgid "Created" msgstr "Створено" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -939,12 +952,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "Наразі жодних органів не було створено" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "" @@ -972,32 +985,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Видалити шаблон" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "Видалено" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1013,18 +1026,18 @@ msgstr "Опис" msgid "Description:" msgstr "Опис:" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "Подробиці" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1035,7 +1048,7 @@ msgstr "Подробиці:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "Передано" @@ -1044,24 +1057,24 @@ msgstr "Передано" msgid "Didn't use map" msgstr "Не використовувати карту" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "Таблиця найстаранніших призерів" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Не відправляти листи автору про нові коментарі" @@ -1070,7 +1083,7 @@ msgstr "Не відправляти листи автору про нові ко msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1078,7 +1091,7 @@ msgstr "" msgid "Don’t know" msgstr "Не знаю" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "Не любите форми?" @@ -1086,19 +1099,19 @@ msgstr "Не любите форми?" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "Перетягніть фотографії сюди чи натисніть для завантаження" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1106,8 +1119,8 @@ msgid "" " " msgstr "" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1115,23 +1128,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Редагувати" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "Редагувати дані про орган" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "Редагувати права користувача" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1139,15 +1152,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "Редагувати звіт" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1170,28 +1183,28 @@ msgstr "Редагуємо проблему %d" msgid "Editing update %d" msgstr "Редагуємо оновлення %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "Редагуємо користувача %d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "Редактор" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "Е-пошта" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1220,37 +1233,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "Е-пошта:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1258,8 +1271,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1267,16 +1280,16 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1284,7 +1297,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "Кінцева точка" @@ -1306,10 +1319,6 @@ msgstr "Введіть найближчу поштову адресу, або н msgid "Enter a nearby street name and area" msgstr "Введіть назву вулиці чи району поблизу" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "Введіть подробиці проблеми" @@ -1323,13 +1332,13 @@ msgstr "Введіть подробиці проблеми" msgid "Error" msgstr "Помилка" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "Всі" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "Зразок поштового коду %s" @@ -1341,11 +1350,11 @@ msgstr "Приклади:" msgid "Existing category" msgstr "Категорії існують" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1362,7 +1371,7 @@ msgstr "" msgid "External ID" msgstr "Зовнішній ID" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "Зовнішнє посилання" @@ -1383,25 +1392,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "Додаткові дані:" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "Подробиці" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1424,11 +1433,12 @@ msgstr "" msgid "Filter report list" msgstr "Фільтрувати список звітів" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "Ім’я" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "Полагодіть це вибравши зону покриття в формі редагування органу нижче." @@ -1448,9 +1458,9 @@ msgstr "Вирішено - Рада" msgid "Fixed - User" msgstr "Вирішено - Користувач" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "Відмітьте як видалене" @@ -1458,8 +1468,8 @@ msgstr "Відмітьте як видалене" msgid "Flag user" msgstr "Відмітьте користувача" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "Відмічено" @@ -1467,7 +1477,7 @@ msgstr "Відмічено" msgid "Flagged reports and users" msgstr "Відмічені звіти та користувачі" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "Відмічені користувачі виписані на відміченій сторінці." @@ -1476,7 +1486,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "Відмічені користувачі не заборонені. Це просто список користувачів, які потребують уваги." #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "Відмічено:" @@ -1492,7 +1502,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "For more information, see How FixMyStreet uses Mapit." @@ -1506,11 +1516,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "Забули пароль?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "" @@ -1526,6 +1536,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "Отримувати оновлення" @@ -1556,9 +1568,9 @@ msgstr "" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1568,7 +1580,7 @@ msgstr "Вперед" msgid "Going to send questionnaire?" msgstr "Збираєтесь відправити опитувальник?" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "Надання адміністративного доступу" @@ -1576,7 +1588,7 @@ msgstr "Надання адміністративного доступу" msgid "Graph of problem creation by status over time" msgstr "Графік створення проблем з часом" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1627,11 +1639,11 @@ msgstr "Прихований" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1652,9 +1664,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "Приховати привязки" @@ -1671,11 +1683,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "Історія" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "Домашня" @@ -1683,7 +1695,7 @@ msgstr "Домашня" msgid "How to report a problem" msgstr "Як сповістити про проблему" -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "Як надіслати якісне сповіщення" @@ -1705,7 +1717,7 @@ msgstr "Нажаль ми не можем знайти вашу проблему #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1714,8 +1726,8 @@ msgstr "Нажаль ми не можем знайти вашу проблему msgid "ID" msgstr "Ідентифікатор" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1739,7 +1751,7 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1747,7 +1759,7 @@ msgstr "" "Якщо два чи більше органи обслуговують певний регіон, сервіс сполучає ідентичні категорії в один запис\n" " в меню. Переконайтесь, що ви використовуєте однакові назви категорій якщо хочете, щоб це сталось." -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1759,6 +1771,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Якщо ви отримаєте більше інформації про стан вашої проблеми, будь ласка, поверніться на сайт і залиште оновлення." +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1786,34 +1802,34 @@ msgid "" "(please note it will not be sent to the council)." msgstr "" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "Невірний ідентифікатор" @@ -1821,7 +1837,7 @@ msgstr "Невірний ідентифікатор" msgid "Illegal feed selection" msgstr "Невірний вибір завантаження" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1833,7 +1849,7 @@ msgstr "В чорний список?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1849,15 +1865,15 @@ msgstr "Додати особисті дані автора сповіщення msgid "Incorrect has_photo value \"%s\"" msgstr "Невірне значення has_photo \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1865,7 +1881,7 @@ msgstr "" msgid "Internal notes" msgstr "Внутрішні нотатки" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1873,12 +1889,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "Невірне значення agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "Невірний формат %s ." -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1899,7 +1915,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1912,8 +1928,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "Остання правка" @@ -1929,17 +1945,17 @@ msgstr "Останнє поновлення:" msgid "Last update:" msgstr "Останнє поновлення:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Залишіть це поле порожнім якщо всі сповіщення цьому органу будуть відсилатись одним і тим самим чином (наприклад, \"%s\")." @@ -1947,7 +1963,7 @@ msgstr "Залишіть це поле порожнім якщо всі спов msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "Показати всі прозвітовані проблеми" @@ -1991,16 +2007,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2008,23 +2024,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "Мапа" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "" @@ -2032,15 +2048,15 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Позначте користувачів, чию поведінку ви хочете відстежувати прапорцем." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "Повідомлення" @@ -2056,19 +2072,19 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "Бракує jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2076,10 +2092,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2097,12 +2113,12 @@ msgstr "" msgid "Month" msgstr "Місяць" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2114,11 +2130,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2127,7 +2143,7 @@ msgstr "Ім'я" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "Ім'я:" @@ -2137,11 +2153,11 @@ msgstr "Ім'я:" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2153,7 +2169,7 @@ msgstr "Найближча дорога до шпильки на карті (а msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Найближчий поштовий індекс до шпильки на карті (автоматично згенеровано): %s (відстань: %sм)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Найближча дорога до шпильки на карті (автоматично згенеровано через Bing карти): %s%s" @@ -2179,11 +2195,11 @@ msgstr "" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "Новий орган додано" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "Новий контакт категорії додано" @@ -2219,23 +2235,23 @@ msgstr "" msgid "New priority" msgstr "Новий приоритет" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2243,7 +2259,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "Нові проблеми для {{COUNCIL}} по {{WARD}} округу" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2279,11 +2295,11 @@ msgstr "Новий стан" msgid "New template" msgstr "Новий шаблон" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2295,10 +2311,10 @@ msgstr "Далі" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2306,11 +2322,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "Ні" @@ -2318,11 +2333,7 @@ msgstr "Ні" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "Без органу" @@ -2330,7 +2341,7 @@ msgstr "Без органу" msgid "No council selected" msgstr "Не вибраний департамент" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "Не було здійснено жодних правок" @@ -2347,11 +2358,11 @@ msgstr "Не знайдено маркованих користувачів" msgid "No further updates" msgstr "Подальші оновлення відсутні" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2359,12 +2370,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "Ніякого результату не повернено" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2381,15 +2392,15 @@ msgstr "Ніхто не підтримав" msgid "None" msgstr "Нічого" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2409,13 +2420,13 @@ msgstr "Не прозвітовано раніше" msgid "Not reported to council" msgstr "Не прозвітовано департаменту" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "Нотатка" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "Нотатка:" @@ -2439,15 +2450,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "Гаразд" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2455,16 +2466,16 @@ msgstr "" msgid "Old state" msgstr "Застарілий стан" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2475,7 +2486,7 @@ msgstr "" msgid "Open" msgstr "Відкрити" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2483,7 +2494,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2515,17 +2526,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "Інше" @@ -2550,8 +2561,8 @@ msgstr "Власник" msgid "Page Not Found" msgstr "Сторінку не знайдено" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "Предок" @@ -2565,19 +2576,19 @@ msgstr "Частково" msgid "Password (optional)" msgstr "Пароль (опціонально)" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "Постійне посилання" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "Дозволи:" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2597,17 +2608,16 @@ msgstr "Номер телефону (опціонально)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "Телефон:" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2618,6 +2628,7 @@ msgstr "Телефон:" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2632,7 +2643,7 @@ msgstr "Фото" msgid "Photo is required." msgstr "Фото обов'язкове." -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "Потрібне фото" @@ -2661,11 +2672,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "Розмістіть шпильку на карті" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "Будь ласка будьте ввічливим, виразним і висловлюйтесь по справі." @@ -2682,7 +2697,7 @@ msgstr "Будь ласка перевірте пароль і спробуйт msgid "Please check your email address is correct" msgstr "Будь ласка перевірте чи ваша адреса е-пошти вірна" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2690,11 +2705,11 @@ msgstr "Будь ласка перевірте чи ваша адреса е-п msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "Будь ласка оберіть категорію" @@ -2703,8 +2718,9 @@ msgstr "Будь ласка оберіть категорію" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Будь ласка, виправте помилки" @@ -2720,13 +2736,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Будь ласка не використовуйте образи — ображаючи департамент ві підриваєте цінність сервісу для всіх користувачів" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "Будь ласка введіть повідомлення" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2734,90 +2750,90 @@ msgstr "Будь ласка введіть повідомлення" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "Будь ласка, введіть ім'я " -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "Будь ласка введіть пароль" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "Будь ласка вкажіть тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "Будь ласка введіть правильну адресу е-пошти" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "Будь ласка введіть правильну адресу е-пошти" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "Будь ласка додайте трохи подробиць" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "Будь ласка вкажіть е-пошту" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "Будь ласка введіть ім'я" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Будь ласка введіть ім'я та прізвище - департаментам потрібні ці дані. Якщо не хочете їх показувати - не ставте галочку внизу." -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "Будь ласка введіть ім'я" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "Будь ласка введіть номер телефону" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "Будь ласка введіть прізвище" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "Будь ласка вкажіть заголовок" @@ -2845,7 +2861,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Будь ласка вкажіть чи ви хочете отримати інші опитування." #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2871,11 +2887,11 @@ msgstr "" msgid "Please note:" msgstr "Будь ласка зауважте:" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "Будь ласка, оприлюдніть оновлений звіт." @@ -2911,16 +2927,16 @@ msgstr "Будь ласка вкажіть чи була вирішена про #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "Будь ласка, завантажте тільки зображення" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "Будь ласка напишіть повідомлення" @@ -2956,12 +2972,12 @@ msgstr "" msgid "Previous" msgstr "Попередній" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -2975,14 +2991,18 @@ msgstr "" msgid "Privacy and cookies" msgstr "" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "Приватний" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "Проблема" @@ -3005,7 +3025,7 @@ msgstr "Проблему %s надіслано департаменту %s" msgid "Problem breakdown by state" msgstr "Розбивка проблем по стану" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "Проблема маркована відкритою." @@ -3013,7 +3033,7 @@ msgstr "Проблема маркована відкритою." msgid "Problem state change based on survey results" msgstr "Стан проблеми змінено базуючись на результатах опитувань" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Проблеми" @@ -3038,7 +3058,7 @@ msgstr "Нещодавно вирішені проблеми" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3063,8 +3083,8 @@ msgstr "" msgid "Property address:" msgstr "Адреса майна:" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "Надішліть оновлення" @@ -3090,7 +3110,7 @@ msgstr "" msgid "Public response:" msgstr "Публічна відповідь:" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3115,6 +3135,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "Анкета %d відправлена по проблемі %d" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "Анкета заповнена автором сповіщення" @@ -3138,11 +3159,11 @@ msgstr "RSS потік для %s району, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "RSS потік з %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -3150,7 +3171,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3170,6 +3191,14 @@ msgstr "RSS стрічка недавніх локальних проблем" msgid "RSS feed of updates to this problem" msgstr "RSS стрічка з оновленнями по цій проблемі" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3189,11 +3218,11 @@ msgstr "" msgid "Recently reported problems" msgstr "Нещодавно перевідкриті проблеми" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3205,7 +3234,7 @@ msgstr "" msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3219,9 +3248,9 @@ msgstr "Зняти прапорець" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "Видалити з переліку" @@ -3247,20 +3276,20 @@ msgstr "Відповісти " msgid "Report" msgstr "Звіт" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "Сповістити про проблему" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3270,7 +3299,7 @@ msgstr "" msgid "Report abuse" msgstr "Поскаржитись" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3304,17 +3333,18 @@ msgid "Report, view, or discuss local problems" msgstr "Сповіщайте, переглядайте, або обговорюйте місцеві проблеми" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "Сповіщено анонімно по %s" #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Сповіщено раніше" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "Перевідкрито %s о %s" @@ -3358,28 +3388,28 @@ msgstr "" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "Сповістити про проблему" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "Сповіщення" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Сповіщення обмежені %s символами. Буль ласка скоротіть сповіщення." -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3391,7 +3421,7 @@ msgstr "Сповіщення очікують підтвердження" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3403,15 +3433,15 @@ msgstr "" msgid "Reports published" msgstr "Сповіщення опубліковано" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3419,11 +3449,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3463,20 +3493,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "Те місце?" @@ -3488,15 +3518,15 @@ msgstr "Обслуговувач цієї дороги (отримано з до msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Обслуговувач цієї дороги (з OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Повернули вліво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3507,23 +3537,23 @@ msgstr "Повернути вправо" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "Зберети зміни" @@ -3532,12 +3562,12 @@ msgstr "Зберети зміни" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3547,7 +3577,8 @@ msgstr "" msgid "Search Reports" msgstr "Пошук сповіщень" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "Пошук користувачів" @@ -3556,7 +3587,7 @@ msgid "Search reports" msgstr "Пошук сповіщень" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "Пошук:" @@ -3566,7 +3597,7 @@ msgstr "Пошук:" msgid "Searching found no reports." msgstr "Пошук не знайшов сповіщень." -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "Пошук не знайшов користувачів." @@ -3582,17 +3613,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "Оберіть орган" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "Оберіть район" @@ -3612,15 +3644,15 @@ msgstr "" msgid "Select:" msgstr "Оберіть:" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3629,7 +3661,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "" @@ -3656,7 +3688,7 @@ msgstr "Сервіс:" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "Визначити поточні координати" @@ -3665,9 +3697,9 @@ msgid "Share" msgstr "Поширити" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "Перелік" @@ -3675,15 +3707,15 @@ msgstr "Перелік" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3695,7 +3727,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "Показувати моє ім'я публічно" @@ -3707,21 +3739,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "Показувати шпильки" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3764,8 +3796,8 @@ msgstr "Вийти" msgid "Some categories may require additional information." msgstr "Деякі категорії потребуватимуть додаткової інформації" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3780,6 +3812,14 @@ msgstr "Деякі фото нещодавніх проблем" msgid "Some text to localize" msgstr "Певний текст для локалізації" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -3797,7 +3837,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Вибачте, сталася помилка" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3819,7 +3859,7 @@ msgstr "Вибачте, ми не можем розпізнати це місц msgid "Sorry, we couldn't save your image(s), please try again." msgstr "" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3829,15 +3869,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3845,31 +3885,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "Стан" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3882,14 +3923,14 @@ msgstr "" msgid "State:" msgstr "Стан:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3905,7 +3946,7 @@ msgid "Status" msgstr "Статус" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3918,7 +3959,7 @@ msgstr "" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3926,12 +3967,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "Підрозділ/Орган" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "Тема" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "Тема:" @@ -3949,7 +3990,7 @@ msgstr "Підтвердити" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -3970,7 +4011,8 @@ msgstr "Підтверджено" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "Підписатись" @@ -3978,21 +4020,29 @@ msgstr "Підписатись" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4012,11 +4062,11 @@ msgstr "Сумарні сповіщення" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4034,8 +4084,8 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4045,7 +4095,7 @@ msgstr "Шаблони" msgid "Text" msgstr "Текст" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "Лише текстова версія" @@ -4089,7 +4139,7 @@ msgstr "Дякуєм, раді чути, що проблему вирішено! msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Під час завантаження фото трапилась помилка(%s), будь ласка повторіть" -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Це місце не підпорядковане Чернівцям; можливо воно знаходиться за його межами? Спробуйте ще раз." @@ -4103,11 +4153,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Поштовий код не розпізнано, вибачте." -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "Цю проблему зараз перезвітують." @@ -4119,23 +4169,23 @@ msgstr "Цей сповіщення неможливо показати на %s. msgid "That report has been removed from FixMyStreet." msgstr "Це сповіщення було видалено." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4143,8 +4193,8 @@ msgstr "" "На цю адресу е-пошти будуть надіслані сповіщення по даній категорії. \n" " Інші категорії по цьому органу можуть мати аналогічну адресу." -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4152,24 +4202,24 @@ msgstr "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4179,8 +4229,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr "" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4195,12 +4245,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "Департамент не зможе допомгти доки інформація не буде достатьою, тому будь ласка опишіть точне місцезнаходження проблеми (наприклад на стіні), що це за проблема, як довго вона існує, опис (і фото проблеми, якщо є), і т.д." -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "Трапилась помилка: %s" @@ -4246,7 +4296,7 @@ msgstr "" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "" @@ -4267,20 +4317,20 @@ msgstr "Адреса '%s' не знайдена на сервері" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Користувач не зміг позначити проблему на карті, тільки введену зону" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4294,7 +4344,11 @@ msgstr "" msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4302,8 +4356,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Сталась проблема з відображенням сторінки всіх сповіщень. Спробуйте пізніше." -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "Сталась помилка при спробі показати сторінку. Будь ласка спробуйте пізніше." @@ -4325,7 +4379,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "Сталась проблема з поновленням. Будь ласка спробуйте ще раз." -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "Зі сповіщенням є негаразди. Гляньте нижче." @@ -4342,8 +4396,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4352,7 +4406,7 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4370,36 +4424,35 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users cannot report problems to this body." msgstr "" -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "" -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ця інформація обов'язкова" @@ -4416,7 +4469,11 @@ msgstr "" msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4432,12 +4489,16 @@ msgstr "Цю проблему не вирішено" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Це сповіщення очікує модерації." @@ -4458,7 +4519,7 @@ msgstr "Це сповіщення відмічено відкритим." msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Ця веб-сторінка також містить фото проблеми, які надав користувач." @@ -4469,7 +4530,7 @@ msgstr "Ця веб-сторінка також містить фото проб msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Хронологія" @@ -4507,7 +4568,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "До перегляду точного місцезнаходження проблеми на карті" @@ -4536,34 +4597,34 @@ msgstr "" msgid "Total" msgstr "Загалом" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "Спробуйте ще раз" @@ -4582,16 +4643,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4609,7 +4670,7 @@ msgstr "Невідомий тип алярму" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "Невідома помилка" @@ -4622,7 +4683,7 @@ msgstr "Невідома помилка" msgid "Unknown problem ID" msgstr "Невідомий ідентифікатор проблеми" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4635,7 +4696,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "Поновлення" @@ -4644,16 +4705,16 @@ msgstr "Поновлення" msgid "Update %s created for problem %d; by %s" msgstr "Поновлення %s створено для проблеми %d; від %s" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "Поновлення додано анонімно о %s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "Поновлення нижче додано %s о %s" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "Поновити орган" @@ -4678,7 +4739,7 @@ msgstr "Поновлення відмітило проблему як виріш msgid "Update reopened problem" msgstr "Поновлення перевідкрило проблему" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "Поновити статуси" @@ -4696,14 +4757,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "Поновлено!" @@ -4728,12 +4789,12 @@ msgstr "Поновлення стосовно {{title}}" msgid "Updates to this problem, %s" msgstr "" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4743,15 +4804,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4760,48 +4821,48 @@ msgstr "" msgid "Used map" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "Користувацький прапорець видалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "Користувач відмічений" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Пошук користувачів знайшов співпадіння в іменах та поштових адресах" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4810,20 +4871,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "Користувачі" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "Значення оновлено" @@ -4857,12 +4918,12 @@ msgstr "Переглянути сповіщення по району" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "Переглядаєм локацію" @@ -4897,7 +4958,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Ми розумієм, що проблема може лежати у відповідальності %s; нажаль, наразі у нас немає їх контактних даних. Якщо ви знаєте точну адресу, будь ласка залишайтесь на зв'язку." @@ -4912,8 +4973,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "Ми будем використовувати ваші персональні дані лише у відповідності до політики конфіденційності." +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4927,8 +4988,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "Коли відредаговано" @@ -4948,14 +5013,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "" @@ -4976,15 +5037,19 @@ msgstr "" msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" msgstr "Хочете отримати ще іншу анкету за 4 тижні, нагадуючу вам про перевірку статусу?" +#: templates/web/base/report/new/duplicate_suggestions.html:23 +msgid "Would you like us to notify you when this problem is updated or fixed?" +msgstr "" + #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." msgstr "Повідомлення, написане суцільними великими літерами, робить його важким для сприйняття. Недосконала пунктуація так само." -#: perllib/FixMyStreet/Cobrand/Default.pm:1213 +#: perllib/FixMyStreet/Cobrand/Default.pm:1200 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/bodies.html:70 -#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/bodies/category.html:6 +#: templates/web/base/admin/bodies/index.html:70 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 @@ -4993,20 +5058,19 @@ msgstr "Повідомлення, написане суцільними вели #: templates/web/base/admin/report_edit.html:132 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:25 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/admin/users.html:32 -#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/admin/users/alerts.html:21 +#: templates/web/base/admin/users/index.html:32 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:37 -#: templates/web/base/report/_inspect.html:111 +#: templates/web/base/report/_inspect.html:114 msgid "Yes" msgstr "Так" -#: templates/web/base/contact/index.html:48 +#: templates/web/base/contact/index.html:50 msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:94 +#: templates/web/base/js/translation_strings.html:100 msgid "You are offline" msgstr "" @@ -5014,7 +5078,7 @@ msgstr "" msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" msgstr "You are reporting the following problem report for being abusive, containing personal information, or similar:" -#: templates/web/base/contact/index.html:25 +#: templates/web/base/contact/index.html:27 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "You are reporting the following update for being abusive, containing personal information, or similar:" @@ -5027,7 +5091,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Ви можете переглянути проблему на цьому сайті." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." @@ -5035,7 +5099,7 @@ msgstr "You can add an abusive user's email to the abuse list, which automatical msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "Технічна підтримка доступна за адресою %s" @@ -5053,15 +5117,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "" -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "Ви відхилили. Будь ласка заповніть форму вище" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5127,7 +5191,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "Вам потрібно додати певні органи (ради чи департаменти) перед тим як відправляти сповіщення." -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5152,9 +5216,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Ваша пошта" @@ -5170,10 +5235,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "Ваша інформація буде використана згідно політики конфіденційності" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "Ваше ім'я" @@ -5189,7 +5254,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5212,7 +5277,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "Ваш телефон" @@ -5237,7 +5302,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5254,25 +5319,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "всі" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5306,8 +5370,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "редагувати користувача" @@ -5316,12 +5380,12 @@ msgstr "редагувати користувача" msgid "from %s different users" msgstr "від %s різних користувачів" -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "останнє поновлення %s" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "менше хвилини" @@ -5332,7 +5396,7 @@ msgid "n/a" msgstr "недоступно" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5372,7 +5436,7 @@ msgstr "в оригіналі вказано: “%s”" msgid "other areas:" msgstr "інші зони:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5380,7 +5444,7 @@ msgstr "" msgid "sign out" msgstr "вийти" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5397,19 +5461,19 @@ msgstr "шпильки немає так як користувач не вико msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "цей тип локальної проблеми" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "сьогодні" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5425,11 +5489,11 @@ msgstr "користувач з тієї ж ради що й проблема - msgid "user is problem owner" msgstr "користувач є власником проблеми" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5438,7 +5502,7 @@ msgstr "" msgid "ward" msgstr "двір" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" @@ -5447,7 +5511,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -5456,7 +5520,7 @@ msgstr[1] "%d днів" msgstr[2] "%d днів" msgstr[3] "%d днів" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -5465,7 +5529,7 @@ msgstr[1] "%d годин" msgstr[2] "%d годин" msgstr[3] "%d годин" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -5474,7 +5538,7 @@ msgstr[1] "%d хвилин" msgstr[2] "%d хвилин" msgstr[3] "%d хвилин" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5492,7 +5556,7 @@ msgstr[1] "%d прибічників" msgstr[2] "%d прибічників" msgstr[3] "%d прибічників" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -5501,7 +5565,7 @@ msgstr[1] "%d тижднів" msgstr[2] "%d тижднів" msgstr[3] "%d тижднів" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5591,7 +5655,7 @@ msgstr[1] "%s оновлень на звіті" msgstr[2] "%s оновлень на звіті" msgstr[3] "%s оновлень на звіті" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5618,7 +5682,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po index b2b0f3af41e..b527539e788 100644 --- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,15 @@ # Matthew Somerville , 2011-06-03. # # Translators: -# mySociety , 2018 +# mySociety , 2019 # msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2018-12-19 17:14+0000\n" -"PO-Revision-Date: 2018-12-21 13:37+0000\n" -"Last-Translator: mySociety , 2018\n" +"POT-Creation-Date: 2019-04-29 18:56+0100\n" +"PO-Revision-Date: 2019-04-29 18:03+0000\n" +"Last-Translator: mySociety , 2019\n" "Language-Team: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n" "Language: zh\n" "MIME-Version: 1.0\n" @@ -22,11 +22,11 @@ msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:678 #: perllib/FixMyStreet/DB/Result/Problem.pm:680 -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:198 msgid " and " msgstr "與" -#: templates/web/base/js/translation_strings.html:44 +#: templates/web/base/js/translation_strings.html:50 #: templates/web/base/report/new/category_extras.html:15 #: templates/web/base/report/new/councils_text_all.html:5 #: templates/web/base/report/new/top_message_none.html:12 @@ -36,11 +36,11 @@ msgstr "與" msgid " or " msgstr "或" -#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_inspect.html:171 msgid "%d characters maximum" msgstr "" -#: templates/web/base/admin/edit-league.html:12 +#: templates/web/base/admin/bodies/edit-league.html:12 msgid "%d edits by %s" msgstr " 由 %d 編輯 %d" @@ -48,7 +48,7 @@ msgstr " 由 %d 編輯 %d" msgid "%d to %d of %d" msgstr "%d 到 %d 的 %d " -#: templates/web/base/admin/user_import.html:42 +#: templates/web/base/admin/users/import.html:42 msgid "%d users already existed" msgstr "" @@ -160,7 +160,7 @@ msgstr "(例如塗鴉, 文宣張貼, 人行道鋪板或街燈損壤, )" msgid "(no longer exists)" msgstr "" -#: templates/web/base/report/_item.html:75 +#: templates/web/base/report/_item_small.html:30 msgid "(not sent to council)" msgstr "不要向地方政府送出" @@ -169,11 +169,11 @@ msgstr "不要向地方政府送出" msgid "(optional)" msgstr "(任選)" -#: templates/web/base/report/_item.html:73 +#: templates/web/base/report/_item_small.html:28 msgid "(sent to all)" msgstr "" -#: templates/web/base/report/_item.html:74 +#: templates/web/base/report/_item_small.html:29 msgid "(sent to both)" msgstr "兩個都送出" @@ -182,13 +182,13 @@ msgstr "兩個都送出" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:251 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:710 #: perllib/FixMyStreet/DB/Result/Problem.pm:386 msgid "-- Pick a category --" msgstr "選擇分類" -#: templates/web/base/report/new/category_extras_fields.html:18 +#: templates/web/base/report/new/category_extras_fields.html:19 msgid "-- Pick an option --" msgstr "" @@ -196,8 +196,8 @@ msgstr "" msgid "--Choose a template--" msgstr "" -#: templates/web/base/admin/body-form.html:50 -#: templates/web/base/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:50 +#: templates/web/base/admin/bodies/form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" " This is probably why \"area covered\" is empty (below).
\n" @@ -214,11 +214,11 @@ msgid "

Reports, Statistics and Actions for

%s

" msgstr "" #. ("The first %s is a dropdown of all/fixed/etc, the second is a dropdown of categories") -#: templates/web/base/reports/_list-filters.html:65 +#: templates/web/base/reports/_list-filters.html:70 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:95 +#: templates/web/base/js/translation_strings.html:101 msgid "%s saved." msgstr "" @@ -243,11 +243,11 @@ msgstr "不 我要用電子郵件收到更新通知" msgid "No Let me confirm my update by email/text" msgstr "" -#: templates/web/base/report/_inspect.html:197 +#: templates/web/base/report/_inspect.html:200 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr "" -#: templates/web/base/report/_inspect.html:199 +#: templates/web/base/report/_inspect.html:202 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" @@ -267,8 +267,8 @@ msgstr "" msgid "Add" msgstr "" -#: templates/web/base/admin/body-form.html:3 -#: templates/web/base/admin/body-form.html:4 +#: templates/web/base/admin/bodies/form.html:3 +#: templates/web/base/admin/bodies/form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" " to which problem reports can be sent. You can add one or more contacts (for different\n" @@ -279,13 +279,13 @@ msgstr "" "每份內容中 ,你可以加入一個或更多聯絡對象(因不同\n" "類型的問題) " -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/bodies/body.html:61 msgid "Add a contact using the form below." msgstr "增加聯絡人請使用下方表單" -#: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/base/admin/bodies/index.html:78 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Add body" msgstr "新增有關單位" @@ -306,8 +306,8 @@ msgstr "" msgid "Add fixed state" msgstr "" -#: templates/web/base/admin/body.html:126 -#: templates/web/zurich/admin/body.html:33 +#: templates/web/base/admin/bodies/body.html:127 +#: templates/web/zurich/admin/bodies/body.html:33 msgid "Add new category" msgstr "新增種類" @@ -322,27 +322,27 @@ msgstr "" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:24 -#: templates/web/base/report/_main.html:35 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:25 +#: templates/web/base/report/_main.html:36 msgid "Add to shortlist" msgstr "" -#: templates/web/base/admin/user_edit.html:4 -#: templates/web/base/admin/users.html:48 -#: templates/web/base/admin/users.html:51 +#: templates/web/base/admin/users/edit.html:4 +#: templates/web/base/admin/users/index.html:48 +#: templates/web/base/admin/users/index.html:51 msgid "Add user" msgstr "新增使用者" -#: perllib/FixMyStreet/Cobrand/Default.pm:744 +#: perllib/FixMyStreet/Cobrand/Default.pm:736 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:746 +#: perllib/FixMyStreet/Cobrand/Default.pm:738 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:745 +#: perllib/FixMyStreet/Cobrand/Default.pm:737 msgid "Add/edit response templates" msgstr "" @@ -350,7 +350,7 @@ msgstr "" msgid "Added %s" msgstr "新增 %s" -#: templates/web/base/report/_main.html:152 +#: templates/web/base/report/_main.html:158 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -379,7 +379,6 @@ msgstr "通知我此事後續" msgid "Alerts:" msgstr "" -#: templates/web/base/dashboard/index.html:30 #: templates/web/base/dashboard/index.html:40 #: templates/web/base/dashboard/index.html:51 #: templates/web/base/dashboard/index.html:64 @@ -426,11 +425,15 @@ msgstr "%s 與 %s 之間申報" msgid "All time" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:7 +msgid "Already been reported?" +msgstr "" + #: templates/web/base/my/anonymize.html:20 msgid "Alternatively, we can hide your name on all of your reports and updates across the site:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:165 +#: templates/web/base/admin/bodies/open311-form-fields.html:165 msgid "Always fetch all problems" msgstr "" @@ -449,9 +452,9 @@ msgid "Anonymous user" msgstr "" #: templates/web/base/admin/report_edit.html:130 -#: templates/web/base/admin/report_edit.html:199 #: templates/web/base/admin/update_edit.html:23 #: templates/web/base/admin/update_edit.html:96 +#: templates/web/base/report/update/moderation_diff.html:5 msgid "Anonymous:" msgstr "匿名:" @@ -460,29 +463,29 @@ msgstr "匿名:" msgid "Another user" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:76 msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:85 #: templates/web/base/admin/template_edit.html:91 -#: templates/web/base/js/translation_strings.html:90 +#: templates/web/base/js/translation_strings.html:96 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" -#: templates/web/base/admin/body-form.html:77 -#: templates/web/base/admin/body.html:20 -#: templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/bodies/body.html:21 +#: templates/web/base/admin/bodies/form.html:77 +#: templates/web/zurich/admin/bodies/form.html:24 msgid "Area covered" msgstr "涵蓋區域" -#: templates/web/base/admin/user-form.html:82 +#: templates/web/base/admin/users/form.html:82 msgid "Area:" msgstr "" -#: templates/web/base/admin/bodies.html:19 -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/bodies/body.html:65 +#: templates/web/base/admin/bodies/index.html:19 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "作為一個支援平台　%s出錯，本站所作的申報將送達給申報者，而不是申報類別下提供的承辦人員。　　" @@ -503,11 +506,11 @@ msgstr "分派給外部機：" msgid "Assign to subdivision:" msgstr "交派給下級單位：" -#: perllib/FixMyStreet/Cobrand/Default.pm:741 +#: perllib/FixMyStreet/Cobrand/Default.pm:733 msgid "Assign users to areas" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:185 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:183 msgid "Assigned to %s" msgstr "派給　%s" @@ -519,8 +522,8 @@ msgstr "每一則詢問的申報幾乎達 %d地回覆了。所有的要求，依 msgid "At the moment only searching for and looking at reports work." msgstr "目前僅提供部份查詢與查閱" -#: templates/web/base/admin/user-form.html:96 -#: templates/web/base/admin/user-form.html:97 +#: templates/web/base/admin/users/form.html:98 +#: templates/web/base/admin/users/form.html:99 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" @@ -536,7 +539,7 @@ msgstr "" msgid "Automated" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:723 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Automatically populate report subject/detail" msgstr "" @@ -557,11 +560,11 @@ msgstr "" msgid "Awaiting moderation" msgstr "待核可" -#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:43 msgid "Back" msgstr "回上層" -#: templates/web/base/report/_main.html:7 +#: templates/web/base/report/_main.html:8 msgid "Back to all reports" msgstr "" @@ -569,10 +572,10 @@ msgstr "" msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 -#: perllib/FixMyStreet/Cobrand/Default.pm:743 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 -#: templates/web/base/admin/bodies.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 +#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:408 +#: templates/web/base/admin/bodies/index.html:1 #: templates/web/base/admin/report_edit.html:56 #: templates/web/zurich/header.html:49 msgid "Bodies" @@ -581,17 +584,17 @@ msgstr "有關單位" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/index.html:63 #: templates/web/base/admin/reports.html:15 -#: templates/web/base/admin/user_import.html:25 -#: templates/web/base/admin/user_import.html:48 -#: templates/web/base/admin/users.html:18 +#: templates/web/base/admin/users/import.html:25 +#: templates/web/base/admin/users/import.html:48 +#: templates/web/base/admin/users/index.html:18 msgid "Body" msgstr "有關單位" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/users/form.html:50 msgid "Body:" msgstr "有關單位:" -#: templates/web/base/admin/user_import.html:12 +#: templates/web/base/admin/users/import.html:12 msgid "CSV File" msgstr "" @@ -607,7 +610,7 @@ msgstr "你的信箱中找不到我們的來信嗎？先檢查看看垃圾回收 msgid "Can't see the map? Skip this step" msgstr "無法顯示地圖？ 略過本步驟" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:647 #: templates/web/base/admin/responsepriorities/list.html:8 #: templates/web/base/admin/templates.html:7 msgid "Categories" @@ -618,15 +621,15 @@ msgstr "" msgid "Categories:" msgstr "" -#: templates/web/base/admin/body.html:72 -#: templates/web/base/admin/contact-form.html:19 +#: templates/web/base/admin/bodies/body.html:73 +#: templates/web/base/admin/bodies/contact-form.html:19 #: templates/web/base/admin/stats/fix_rate.html:4 #: templates/web/base/dashboard/index.html:100 -#: templates/web/base/report/_inspect.html:69 -#: templates/web/base/report/_item.html:97 -#: templates/web/base/report/new/category.html:14 +#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_item.html:64 +#: templates/web/base/report/new/category.html:22 #: templates/web/base/report/new/category_wrapper.html:3 -#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/bodies/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 @@ -639,7 +642,7 @@ msgstr "類別" msgid "Category and State" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 +#: perllib/FixMyStreet/App/Controller/Admin.pm:618 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" @@ -649,9 +652,9 @@ msgid "Category fix rate for problems > 4 weeks old" msgstr "4週前己修復問題之類別" #: templates/web/base/admin/report_edit.html:126 -#: templates/web/base/admin/report_edit.html:201 #: templates/web/base/dashboard/index.html:39 -#: templates/web/zurich/admin/contact-form.html:8 +#: templates/web/base/report/update/moderation_diff.html:7 +#: templates/web/zurich/admin/bodies/contact-form.html:8 #: templates/web/zurich/admin/report_edit-sdm.html:72 #: templates/web/zurich/admin/report_edit.html:100 msgid "Category:" @@ -678,11 +681,11 @@ msgstr "更換密碼" msgid "Change phone number" msgstr "" -#: templates/web/base/admin/contact-form.html:80 +#: templates/web/base/admin/bodies/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" -#: templates/web/base/admin/contact-form.html:64 +#: templates/web/base/admin/bodies/contact-form.html:64 msgid "" "Check private if reports in this category should never be displayed on the website.\n" "
\n" @@ -699,17 +702,17 @@ msgstr "" "這類問題適合於用戶申報給有關機關，但公開申報資料並無公益性\n" "例如在英國想在某特定地點要求多安置垃圾筒" -#: templates/web/base/admin/contact-form.html:11 +#: templates/web/base/admin/bodies/contact-form.html:11 msgid "" "Choose a category name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "選擇民眾可理解的類別 (例如., \"路面坑洞\", \"街燈故障\") 也助於讓有關單位掌握. 此類別將會顯示在申報問題頁的下拉式選項上。" -#: templates/web/base/report/_inspect.html:124 +#: templates/web/base/report/_inspect.html:127 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:89 +#: templates/web/base/js/translation_strings.html:95 msgid "Clear offline data" msgstr "" @@ -741,9 +744,13 @@ msgstr "" msgid "Click the map or drag the pin to adjust the location" msgstr "" +#: templates/web/base/report/new/duplicate_suggestions.html:6 +msgid "Close" +msgstr "" + #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:180 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:158 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:161 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:159 #: perllib/FixMyStreet/DB/ResultSet/State.pm:71 #: templates/web/base/admin/states/index.html:103 #: templates/web/base/admin/states/index.html:27 @@ -787,17 +794,17 @@ msgstr "聯合品牌:" msgid "Code" msgstr "" -#: templates/web/base/js/translation_strings.html:61 +#: templates/web/base/js/translation_strings.html:67 msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:424 +#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:422 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "設定" -#: templates/web/base/admin/body.html:77 +#: templates/web/base/admin/bodies/body.html:78 msgid "Confirm" msgstr "確認" @@ -818,9 +825,9 @@ msgstr "" msgid "Confirmation" msgstr "確認" -#: templates/web/base/admin/contact-form.html:56 -#: templates/web/base/admin/user-alerts.html:10 -#: templates/web/zurich/admin/contact-form.html:35 +#: templates/web/base/admin/bodies/contact-form.html:56 +#: templates/web/base/admin/users/alerts.html:10 +#: templates/web/zurich/admin/bodies/contact-form.html:35 #: templates/web/zurich/admin/stats/index.html:61 msgid "Confirmed" msgstr "已確認" @@ -850,7 +857,11 @@ msgstr "連結本團隊" msgid "Continue" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:151 +#: templates/web/base/report/new/duplicate_suggestions.html:17 +msgid "Continue – report a new problem" +msgstr "" + +#: templates/web/base/admin/bodies/open311-form-fields.html:151 msgid "Convert location from Easting/Northing" msgstr "" @@ -859,12 +870,12 @@ msgstr "" msgid "Coordinates:" msgstr "協同單位:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2083 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2112 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:624 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:653 msgid "Could not find user" msgstr "找不到該戶用" -#: templates/web/base/js/translation_strings.html:47 +#: templates/web/base/js/translation_strings.html:53 msgid "Could not look up location" msgstr "找不到此地點" @@ -872,9 +883,11 @@ msgstr "找不到此地點" msgid "Council" msgstr "地方政府" -#: templates/web/base/admin/body.html:1 -#: templates/web/base/admin/category_edit.html:1 -#: templates/web/zurich/admin/body.html:1 +#: templates/web/base/admin/bodies/body.html:1 +#: templates/web/base/admin/bodies/body.html:2 +#: templates/web/base/admin/bodies/category.html:1 +#: templates/web/base/admin/bodies/category.html:2 +#: templates/web/zurich/admin/bodies/body.html:1 msgid "Council contacts for %s" msgstr "聯繋地方政府 %s" @@ -903,8 +916,8 @@ msgstr "創建申報" msgid "Create an account" msgstr "" -#: templates/web/base/admin/contact-form.html:156 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/admin/bodies/contact-form.html:156 +#: templates/web/zurich/admin/bodies/contact-form.html:49 msgid "Create category" msgstr "創建類別" @@ -912,15 +925,15 @@ msgstr "創建類別" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:727 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:725 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 msgid "Create reports/updates on a user's behalf" msgstr "" @@ -934,7 +947,7 @@ msgstr "創建模版" msgid "Created" msgstr "建立" -#: templates/web/base/admin/user_import.html:20 +#: templates/web/base/admin/users/import.html:20 msgid "Created %d new users" msgstr "" @@ -957,12 +970,12 @@ msgstr "" msgid "Currently grouped by %s" msgstr "" -#: templates/web/base/admin/bodies.html:9 +#: templates/web/base/admin/bodies/index.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." msgstr "目前未創建內文" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:873 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:871 #: templates/web/zurich/admin/report_edit-sdm.html:105 msgid "Customer not contactable" msgstr "無法聨絡上的客戶" @@ -990,32 +1003,32 @@ msgstr "" msgid "Default priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Default to creating reports/updates as the council" msgstr "" -#: templates/web/base/report/_inspect.html:93 +#: templates/web/base/report/_inspect.html:96 msgid "Defect type" msgstr "" -#: templates/web/base/admin/user-alerts.html:15 +#: templates/web/base/admin/users/alerts.html:15 msgid "Delete" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:773 #: templates/web/base/admin/template_edit.html:91 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "刪除模版" -#: templates/web/base/admin/bodies.html:31 -#: templates/web/base/admin/contact-form.html:58 -#: templates/web/zurich/admin/contact-form.html:36 +#: templates/web/base/admin/bodies/contact-form.html:58 +#: templates/web/base/admin/bodies/index.html:31 +#: templates/web/zurich/admin/bodies/contact-form.html:36 msgid "Deleted" msgstr "刪除" -#: templates/web/base/report/_main.html:119 -#: templates/web/base/report/update.html:54 +#: templates/web/base/report/_main.html:125 +#: templates/web/base/report/update.html:56 msgid "Describe why you are moderating this" msgstr "" @@ -1031,18 +1044,18 @@ msgstr "描述" msgid "Description:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:377 +#: perllib/FixMyStreet/App/Controller/Report.pm:416 msgid "Detailed information is limited to %d characters." msgstr "" -#: templates/web/base/admin/user-alerts.html:12 -#: templates/web/base/js/translation_strings.html:42 +#: templates/web/base/admin/users/alerts.html:12 +#: templates/web/base/js/translation_strings.html:45 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "細節" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/admin/report_edit.html:197 +#: templates/web/base/report/update/moderation_diff.html:3 #: templates/web/zurich/admin/report_edit-sdm.html:29 #: templates/web/zurich/admin/report_edit.html:31 #: templates/web/zurich/admin/report_edit.html:45 @@ -1053,7 +1066,7 @@ msgstr "細節:" msgid "Device and Site" msgstr "" -#: templates/web/base/admin/body.html:92 +#: templates/web/base/admin/bodies/body.html:93 msgid "Devolved" msgstr "下放" @@ -1062,24 +1075,24 @@ msgstr "下放" msgid "Didn't use map" msgstr "不使用地圖" -#: templates/web/base/admin/edit-league.html:8 +#: templates/web/base/admin/bodies/edit-league.html:8 msgid "Diligency prize league table" msgstr "勤奮表現名單" -#: templates/web/base/admin/user-alerts.html:14 +#: templates/web/base/admin/users/alerts.html:14 msgid "Disable" msgstr "" -#: templates/web/base/admin/user-alerts.html:23 +#: templates/web/base/admin/users/alerts.html:23 msgid "Disabled:" msgstr "" -#: templates/web/base/report/_main.html:124 -#: templates/web/base/report/update.html:57 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/update.html:59 msgid "Discard changes" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:107 +#: templates/web/base/admin/bodies/open311-form-fields.html:107 msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" @@ -1088,7 +1101,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "您是否有 %s密碼？ " -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:111 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1096,7 +1109,7 @@ msgstr "" msgid "Don’t know" msgstr "不知道" -#: templates/web/base/contact/index.html:122 +#: templates/web/base/contact/index.html:124 msgid "Don't like forms?" msgstr "不喜歡此表單？" @@ -1104,19 +1117,19 @@ msgstr "不喜歡此表單？" msgid "Down one" msgstr "" -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/js/translation_strings.html:75 msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:119 +#: templates/web/base/report/_inspect.html:122 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:129 +#: templates/web/base/report/_inspect.html:132 msgid "Duplicates" msgstr "" -#: templates/web/base/admin/body.html:116 +#: templates/web/base/admin/bodies/body.html:117 msgid "" "Each contact for the body has a category, which is displayed to the public. \n" " Different categories can have the same contact (email address).\n" @@ -1127,8 +1140,8 @@ msgstr "" "不同類別 能夠同一位承辦人 (電子郵件)\n" "這表示你可以多加一些類別，即使你只聯絡一位承辦人員。" -#: templates/web/base/report/_inspect.html:32 -#: templates/web/base/report/_item.html:88 +#: templates/web/base/report/_inspect.html:35 +#: templates/web/base/report/_item.html:55 msgid "Easting/Northing:" msgstr "" @@ -1136,23 +1149,23 @@ msgstr "" #: templates/web/base/admin/problem_row.html:43 #: templates/web/base/admin/responsepriorities/list.html:28 #: templates/web/base/admin/templates.html:31 -#: templates/web/base/admin/users.html:34 +#: templates/web/base/admin/users/index.html:34 #: templates/web/zurich/admin/problem_row.html:49 #: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "編輯" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/bodies/body.html:142 #: templates/web/base/admin/index.html:39 -#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/bodies/body.html:47 msgid "Edit body details" msgstr "編輯有關單位細節" -#: perllib/FixMyStreet/Cobrand/Default.pm:739 +#: perllib/FixMyStreet/Cobrand/Default.pm:731 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:710 msgid "Edit report category" msgstr "" @@ -1160,15 +1173,15 @@ msgstr "" msgid "Edit report details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Edit reports" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:738 +#: perllib/FixMyStreet/Cobrand/Default.pm:730 msgid "Edit users' details/search for their reports" msgstr "" @@ -1191,28 +1204,28 @@ msgstr "編輯問題 %d" msgid "Editing update %d" msgstr "編輯更新 %d" -#: templates/web/base/admin/user_edit.html:2 +#: templates/web/base/admin/users/edit.html:2 msgid "Editing user %d" msgstr "編輯用戶帳號 $d" -#: templates/web/base/admin/category_edit.html:30 +#: templates/web/base/admin/bodies/category.html:31 msgid "Editor" msgstr "編輯器" -#: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/category_edit.html:28 +#: templates/web/base/admin/bodies/category.html:29 +#: templates/web/base/admin/bodies/index.html:27 #: templates/web/base/admin/flagged.html:38 -#: templates/web/base/admin/user_import.html:24 -#: templates/web/base/admin/user_import.html:47 -#: templates/web/base/admin/users.html:17 -#: templates/web/zurich/admin/body-form.html:9 -#: templates/web/zurich/admin/body.html:15 +#: templates/web/base/admin/users/import.html:24 +#: templates/web/base/admin/users/import.html:47 +#: templates/web/base/admin/users/index.html:17 +#: templates/web/zurich/admin/bodies/body.html:15 +#: templates/web/zurich/admin/bodies/form.html:9 #: templates/web/zurich/auth/general.html:14 #: templates/web/zurich/auth/general.html:37 msgid "Email" msgstr "電子郵件" -#: templates/web/base/admin/contact-form.html:38 +#: templates/web/base/admin/bodies/contact-form.html:38 #: templates/web/base/alert/_list.html:74 #: templates/web/base/auth/change_email.html:37 #: templates/web/base/report/new/form_user_loggedin.html:39 @@ -1241,37 +1254,37 @@ msgstr "" msgid "Email me a link to sign in" msgstr "" -#: templates/web/base/admin/user-form.html:25 +#: templates/web/base/admin/users/form.html:25 msgid "Email verified:" msgstr "" #: templates/web/base/admin/report_edit.html:146 -#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 -#: templates/web/zurich/admin/contact-form.html:18 +#: templates/web/base/admin/users/form.html:19 templates/web/base/my/my.html:36 +#: templates/web/zurich/admin/bodies/contact-form.html:18 msgid "Email:" msgstr "電子郵件:" -#: templates/web/base/admin/user-alerts.html:13 +#: templates/web/base/admin/users/alerts.html:13 msgid "Enable" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:156 -#: templates/web/base/admin/open311-form-fields.html:157 +#: templates/web/base/admin/bodies/open311-form-fields.html:156 +#: templates/web/base/admin/bodies/open311-form-fields.html:157 msgid "" "Enable Always fetch all problems if you've enabled Open311 problem-fetching above\n" " and the endpoint always returns a list of all problems. This will suppress error messages about\n" " bad dates in the problems fetched." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:143 -#: templates/web/base/admin/open311-form-fields.html:144 +#: templates/web/base/admin/bodies/open311-form-fields.html:143 +#: templates/web/base/admin/bodies/open311-form-fields.html:144 msgid "" "Enable Convert location from Easting/Northing if you've enabled Open311 problem-fetching above\n" " and problems fetching from the endpoint have the location in Easting/Northings and not Latitude/Longitude." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:127 -#: templates/web/base/admin/open311-form-fields.html:128 +#: templates/web/base/admin/bodies/open311-form-fields.html:127 +#: templates/web/base/admin/bodies/open311-form-fields.html:128 msgid "" "Enable Open311 problem-fetching if you want to display reports created at\n" " the endpoint to FixMyStreet. If you're not sure, you probably do not, so leave this unchecked.\n" @@ -1279,8 +1292,8 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:66 -#: templates/web/base/admin/open311-form-fields.html:67 +#: templates/web/base/admin/bodies/open311-form-fields.html:66 +#: templates/web/base/admin/bodies/open311-form-fields.html:67 msgid "" "Enable Open311 update-sending if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" @@ -1291,8 +1304,8 @@ msgstr "" "如果您不確定是否要開啟，請保留空白\n" "更多資訊說明請見本文(英文)." -#: templates/web/base/admin/body-form.html:121 -#: templates/web/base/admin/body-form.html:122 +#: templates/web/base/admin/bodies/form.html:121 +#: templates/web/base/admin/bodies/form.html:122 msgid "" "Enable this can be devolved setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" @@ -1301,8 +1314,8 @@ msgstr "" "開啟此設定將造成權限混亂因相關單位可能有多位承辦人員使用不同\n" "端點(與送出方式)。例如，如果某些類別的問題申報必須由電子郵件送出，而其它類別則透過Open311送出。" -#: templates/web/base/admin/open311-form-fields.html:54 -#: templates/web/base/admin/open311-form-fields.html:55 +#: templates/web/base/admin/bodies/open311-form-fields.html:54 +#: templates/web/base/admin/bodies/open311-form-fields.html:55 msgid "Enabling this will suppress the error message that is normally emitted when an update has no description" msgstr "" @@ -1310,7 +1323,7 @@ msgstr "" msgid "End Date" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:21 +#: templates/web/base/admin/bodies/open311-form-fields.html:21 msgid "Endpoint" msgstr "結束點" @@ -1332,10 +1345,6 @@ msgstr "輸入本區的郵編，街名或區域。" msgid "Enter a nearby street name and area" msgstr "輸入最近的街名或地區" -#: perllib/FixMyStreet/Cobrand/Smidsy.pm:32 -msgid "Enter a street, area, or landmark" -msgstr "" - #: templates/web/base/index-steps.html:6 msgid "Enter details of the problem" msgstr "請在此填寫問題的細節" @@ -1349,13 +1358,13 @@ msgstr "請在此填寫問題的細節" msgid "Error" msgstr "錯誤" -#: templates/web/base/reports/_list-filters.html:47 -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:50 +#: templates/web/base/reports/_list-filters.html:59 msgid "Everything" msgstr "一切" -#: templates/web/base/admin/body.html:18 -#: templates/web/base/admin/category_edit.html:18 +#: templates/web/base/admin/bodies/body.html:19 +#: templates/web/base/admin/bodies/category.html:19 msgid "Example postcode %s" msgstr "郵遞區號範例 %s" @@ -1367,11 +1376,11 @@ msgstr "範例：" msgid "Existing category" msgstr "" -#: templates/web/base/admin/user_import.html:66 +#: templates/web/base/admin/users/import.html:66 msgid "Existing users won't be modified." msgstr "" -#: templates/web/base/js/translation_strings.html:60 +#: templates/web/base/js/translation_strings.html:66 msgid "Expand map" msgstr "" @@ -1388,7 +1397,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:88 +#: templates/web/base/admin/bodies/form.html:88 msgid "External URL" msgstr "外部網址" @@ -1409,25 +1418,25 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:679 +#: perllib/FixMyStreet/Cobrand/Default.pm:671 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" -#: templates/web/base/admin/contact-form.html:159 +#: templates/web/base/admin/bodies/contact-form.html:159 #: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/report_edit.html:202 #: templates/web/base/admin/update_edit.html:97 +#: templates/web/base/report/update/moderation_diff.html:8 msgid "Extra data:" msgstr "其它資料：" -#: templates/web/base/report/_inspect.html:165 -#: templates/web/base/report/_item.html:113 +#: templates/web/base/report/_inspect.html:168 +#: templates/web/base/report/_item.html:80 msgid "Extra details" msgstr "" -#: templates/web/zurich/admin/contact-form.html:22 +#: templates/web/zurich/admin/bodies/contact-form.html:22 msgid "Extra fields:" msgstr "" @@ -1450,11 +1459,12 @@ msgstr "" msgid "Filter report list" msgstr "過濾初次申報　" +#: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:66 msgid "First time" msgstr "首次" -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies/body.html:53 msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "選擇涵蓋的區域 編輯有關單位 表單。" @@ -1474,9 +1484,9 @@ msgstr "已處理－地方政府" msgid "Fixed - User" msgstr "已處理－用戶" -#: templates/web/base/admin/body-form.html:96 +#: templates/web/base/admin/bodies/form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:35 +#: templates/web/zurich/admin/bodies/form.html:35 msgid "Flag as deleted" msgstr "標記警告為刪除　" @@ -1484,8 +1494,8 @@ msgstr "標記警告為刪除　" msgid "Flag user" msgstr "標記警告用戶" -#: perllib/FixMyStreet/Cobrand/Default.pm:648 -#: templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:640 +#: templates/web/base/admin/users/index.html:20 msgid "Flagged" msgstr "標記警告" @@ -1493,7 +1503,7 @@ msgstr "標記警告" msgid "Flagged reports and users" msgstr "標記警告申報與用戶" -#: templates/web/base/admin/user-form.html:112 +#: templates/web/base/admin/users/form.html:114 msgid "Flagged users are listed on the flagged page." msgstr "標記警告用戶其已被列入 警告頁" @@ -1502,7 +1512,7 @@ msgid "Flagged users are not restricted in any way. This is just a list of users msgstr "被標記警告的用戶其權限不受影響，只是列入特別關注名單" #: templates/web/base/admin/report_edit.html:150 -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/users/form.html:121 msgid "Flagged:" msgstr "警告:" @@ -1518,7 +1528,7 @@ msgstr "" msgid "For each option, Key is the value which is stored in the database for that option and Name is the value displayed to the user." msgstr "" -#: templates/web/base/admin/body-form.html:73 +#: templates/web/base/admin/bodies/form.html:73 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "更多資訊，請詳見如何使用 FixMyStreet 地圖標記（英文）" @@ -1532,11 +1542,11 @@ msgstr "" msgid "Forgotten your password?" msgstr "忘記您的密碼?" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:788 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:786 msgid "Forwarded to external body" msgstr "轉寄給外部機構" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:789 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:787 msgid "Forwarded wish to external body" msgstr "轉寄願望給外部機構" @@ -1552,6 +1562,8 @@ msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 +#: templates/web/base/report/new/duplicate_suggestions.html:32 +#: templates/web/base/report/new/duplicate_suggestions.html:37 msgid "Get updates" msgstr "取得更新" @@ -1582,9 +1594,9 @@ msgstr "很高興聽到問題已處理了。" #: templates/web/base/admin/index.html:49 #: templates/web/base/alert/index.html:37 #: templates/web/base/around/postcode_form.html:16 -#: templates/web/base/reports/_list-filters.html:66 -#: templates/web/base/reports/_list-filters.html:81 -#: templates/web/base/reports/_list-filters.html:87 +#: templates/web/base/reports/_list-filters.html:71 +#: templates/web/base/reports/_list-filters.html:86 +#: templates/web/base/reports/_list-filters.html:92 #: templates/web/base/reports/index.html:89 #: templates/web/zurich/admin/stats/index.html:37 msgid "Go" @@ -1594,7 +1606,7 @@ msgstr "走" msgid "Going to send questionnaire?" msgstr "即將送出問卷？" -#: perllib/FixMyStreet/Cobrand/Default.pm:740 +#: perllib/FixMyStreet/Cobrand/Default.pm:732 msgid "Grant access to the admin" msgstr "" @@ -1602,7 +1614,7 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "隨時間産生的問題圖片" -#: templates/web/base/admin/contact-form.html:134 +#: templates/web/base/admin/bodies/contact-form.html:134 msgid "Group" msgstr "" @@ -1653,11 +1665,11 @@ msgstr "隱藏" msgid "Hidden Field" msgstr "" -#: templates/web/base/admin/user-form.html:202 +#: templates/web/base/admin/users/form.html:204 msgid "Hide all reports and updates" msgstr "" -#: templates/web/base/report/_main.html:115 +#: templates/web/base/report/_main.html:121 msgid "Hide entire report" msgstr "" @@ -1678,9 +1690,9 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:60 -#: templates/web/base/around/display_location.html:68 -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/around/display_location.html:61 +#: templates/web/base/around/display_location.html:69 +#: templates/web/base/js/translation_strings.html:72 msgid "Hide pins" msgstr "隱藏地圖標示" @@ -1697,11 +1709,11 @@ msgstr "" msgid "Hint" msgstr "" -#: templates/web/base/admin/category_edit.html:24 +#: templates/web/base/admin/bodies/category.html:25 msgid "History" msgstr "歷程　" -#: templates/web/base/around/display_location.html:73 +#: templates/web/base/around/display_location.html:74 msgid "Home" msgstr "首頁" @@ -1709,7 +1721,7 @@ msgstr "首頁" msgid "How to report a problem" msgstr "如何申報問題 " -#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/js/translation_strings.html:44 msgid "How to send successful reports" msgstr "如何成功地送出申報" @@ -1731,7 +1743,7 @@ msgstr " 我們無法在資料庫中找到您的問題。\n" #: templates/web/base/admin/index.html:60 #: templates/web/base/admin/list_updates.html:6 #: templates/web/base/admin/reports.html:12 -#: templates/web/base/admin/user-alerts.html:8 +#: templates/web/base/admin/users/alerts.html:8 #: templates/web/zurich/admin/index-dm.html:21 #: templates/web/zurich/admin/index-sdm.html:19 #: templates/web/zurich/admin/list_updates.html:24 @@ -1740,8 +1752,8 @@ msgstr " 我們無法在資料庫中找到您的問題。\n" msgid "ID" msgstr "帳戶" -#: templates/web/base/admin/body-form.html:32 -#: templates/web/base/admin/body-form.html:33 +#: templates/web/base/admin/bodies/form.html:32 +#: templates/web/base/admin/bodies/form.html:33 msgid "" "Identify a parent if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." @@ -1765,7 +1777,7 @@ msgstr "" msgid "If ticked, this template will be used for Open311 updates that put problems in this state." msgstr "" -#: templates/web/base/admin/contact-form.html:14 +#: templates/web/base/admin/bodies/contact-form.html:14 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." @@ -1774,7 +1786,7 @@ msgstr "" "\n" "如果你想這樣，請確保你在有關單位中使用同一類別。" -#: templates/web/base/contact/index.html:110 +#: templates/web/base/contact/index.html:112 msgid "If you are contacting us about a specific report or update please include a link to the report in the message." msgstr "" @@ -1786,6 +1798,10 @@ msgstr "" msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "如果你對申報之問題有進一步狀況，歡迎回到本站留言更新" +#: templates/web/base/report/new/duplicate_suggestions.html:25 +msgid "If you let us know your email address, we’ll notify you when this problem is updated or fixed." +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:45 msgid "If you only want this priority to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1815,34 +1831,34 @@ msgstr "" "如果您希望公開留言該問題之更新，請在此輸入\n" "(請注意它不會自動送到地方政府)" -#: templates/web/base/admin/contact-form.html:32 +#: templates/web/base/admin/bodies/contact-form.html:32 msgid "If you're using a send method that is not email, enter the service ID (Open311) or equivalent identifier here." msgstr "如果您使用 非電子郵件送出申訴方式, 請在此輸入此服務代號 (Open311) 或同等的代號。" -#: templates/web/base/admin/open311-form-fields.html:112 -#: templates/web/base/admin/open311-form-fields.html:113 +#: templates/web/base/admin/bodies/open311-form-fields.html:112 +#: templates/web/base/admin/bodies/open311-form-fields.html:113 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable extended Open311 stauses if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:100 -#: templates/web/base/admin/open311-form-fields.html:99 +#: templates/web/base/admin/bodies/open311-form-fields.html:100 +#: templates/web/base/admin/bodies/open311-form-fields.html:99 msgid "" "If you've enabled Open311 update-sending above, enable suppression of alerts \n" " if you do not want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:82 -#: templates/web/base/admin/open311-form-fields.html:83 +#: templates/web/base/admin/bodies/open311-form-fields.html:82 +#: templates/web/base/admin/bodies/open311-form-fields.html:83 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet user will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:143 +#: perllib/FixMyStreet/App/Controller/Contact.pm:152 msgid "Illegal ID" msgstr "無效帳戶" @@ -1850,7 +1866,7 @@ msgstr "無效帳戶" msgid "Illegal feed selection" msgstr "無效的訂閱選項" -#: templates/web/base/admin/user_import.html:15 +#: templates/web/base/admin/users/import.html:15 msgid "Import users" msgstr "" @@ -1862,7 +1878,7 @@ msgstr "濫用表格？" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "此外，下列理由並非為Open311 v2更新特定部份回覆傳送: agency_sent_datetime, 主旨(部份回覆之敍述), interface_used, comment_count, requestor_name (只有在同意姓名公開下才會呈現)." -#: templates/web/base/admin/contact-form.html:57 +#: templates/web/base/admin/bodies/contact-form.html:57 msgid "Inactive" msgstr "" @@ -1878,15 +1894,15 @@ msgstr "包括申報人的個人細節" msgid "Incorrect has_photo value \"%s\"" msgstr "不正確的照片值數 \"%s\"" -#: templates/web/base/report/_inspect.html:5 +#: templates/web/base/report/_inspect.html:8 msgid "Inspect report" msgstr "" -#: templates/web/base/admin/contact-form.html:85 +#: templates/web/base/admin/bodies/contact-form.html:85 msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:722 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Instruct contractors to fix problems" msgstr "" @@ -1894,7 +1910,7 @@ msgstr "" msgid "Internal notes" msgstr "內部筆記" -#: templates/web/base/offline/appcache.html:3 +#: templates/web/base/offline/appcache.html:4 msgid "Internet glitch" msgstr "" @@ -1902,12 +1918,12 @@ msgstr "" msgid "Invalid agency_responsible value %s" msgstr "無效的權責單位數值 %s" -#: perllib/FixMyStreet/App/Controller/Open311.pm:434 +#: perllib/FixMyStreet/App/Controller/Open311.pm:435 msgid "Invalid format %s specified." msgstr "無效的%s 特定格式" -#: perllib/FixMyStreet/App/Controller/Moderate.pm:270 -#: perllib/FixMyStreet/App/Controller/Report.pm:446 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:305 +#: perllib/FixMyStreet/App/Controller/Report.pm:485 msgid "Invalid location. New location must be covered by the same council." msgstr "" @@ -1928,7 +1944,7 @@ msgstr "" msgid "Label" msgstr "" -#: templates/web/base/admin/_translations.html:6 +#: templates/web/base/admin/bodies/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" msgstr "" @@ -1941,8 +1957,8 @@ msgstr "" msgid "Last 7 days" msgstr "" -#: templates/web/base/admin/body.html:74 -#: templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/bodies/body.html:75 +#: templates/web/zurich/admin/bodies/body.html:16 msgid "Last editor" msgstr "最後編輯 " @@ -1958,17 +1974,17 @@ msgstr "上回更新:" msgid "Last update:" msgstr "上一次更新:" -#: templates/web/base/admin/report_edit.html:200 -#: templates/web/base/report/_inspect.html:36 -#: templates/web/base/report/_item.html:93 +#: templates/web/base/report/_inspect.html:39 +#: templates/web/base/report/_item.html:60 +#: templates/web/base/report/update/moderation_diff.html:6 msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:78 +#: templates/web/base/reports/_list-filters.html:83 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:128 +#: templates/web/base/admin/bodies/form.html:128 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "如所有申報皆是用同樣方式送出(例如: \"%s\")，此處請保留空白　" @@ -1976,7 +1992,7 @@ msgstr "如所有申報皆是用同樣方式送出(例如: \"%s\")，此處請 msgid "List" msgstr "" -#: templates/web/base/admin/body.html:31 +#: templates/web/base/admin/bodies/body.html:32 msgid "List all reported problems" msgstr "列出所有申報的問題　" @@ -2020,16 +2036,16 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:82 #: templates/web/base/report/form/user.html:22 msgid "Log in with email" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:80 msgid "Log in with email/text" msgstr "" -#: templates/web/base/admin/user-form.html:200 +#: templates/web/base/admin/users/form.html:202 msgid "Log out of all sessions" msgstr "" @@ -2037,23 +2053,23 @@ msgstr "" msgid "Look up" msgstr "" -#: templates/web/base/js/translation_strings.html:55 +#: templates/web/base/js/translation_strings.html:61 msgid "MAP" msgstr "地圖" -#: templates/web/base/admin/user-form.html:201 +#: templates/web/base/admin/users/form.html:203 msgid "Make anonymous on all reports and updates" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:724 +#: perllib/FixMyStreet/Cobrand/Default.pm:716 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:73 +#: templates/web/base/reports/_list-filters.html:78 msgid "Manual order" msgstr "" -#: templates/web/base/js/translation_strings.html:57 +#: templates/web/base/js/translation_strings.html:63 msgid "Map" msgstr "地圖" @@ -2061,15 +2077,15 @@ msgstr "地圖" msgid "Mark as sent" msgstr "標註為關閉" -#: templates/web/base/admin/user-form.html:110 +#: templates/web/base/admin/users/form.html:112 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "標註用戶哪些行為您將要給予警告標記." -#: perllib/FixMyStreet/Cobrand/Default.pm:721 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Markup problem details" msgstr "" -#: templates/web/base/contact/index.html:103 +#: templates/web/base/contact/index.html:105 msgid "Message" msgstr "留言" @@ -2085,19 +2101,19 @@ msgstr "給外部機構的訊息" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:442 +#: perllib/FixMyStreet/App/Controller/Open311.pm:443 msgid "Missing jurisdiction_id" msgstr "遺失 jurisdiction_id" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:708 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:137 +#: templates/web/base/report/_main.html:143 msgid "Moderate this report" msgstr "" @@ -2105,10 +2121,10 @@ msgstr "" msgid "Moderate this update" msgstr "" -#: templates/web/base/admin/report_edit.html:194 #: templates/web/base/admin/update_edit.html:92 -#: templates/web/base/report/_main.html:79 +#: templates/web/base/report/_main.html:85 #: templates/web/base/report/_update_state.html:19 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "Moderated by %s at %s" msgstr "" @@ -2126,12 +2142,12 @@ msgstr "" msgid "Month" msgstr "月份" -#: templates/web/base/reports/_list-filters.html:79 +#: templates/web/base/reports/_list-filters.html:84 msgid "Most commented" msgstr "" -#: templates/web/base/admin/bodies.html:25 -#: templates/web/base/admin/body-form.html:24 +#: templates/web/base/admin/bodies/form.html:24 +#: templates/web/base/admin/bodies/index.html:25 #: templates/web/base/admin/extra-metadata-form.html:75 #: templates/web/base/admin/flagged.html:16 #: templates/web/base/admin/flagged.html:37 @@ -2143,11 +2159,11 @@ msgstr "" #: templates/web/base/admin/responsepriorities/list.html:6 #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 -#: templates/web/base/admin/user_import.html:23 -#: templates/web/base/admin/user_import.html:46 -#: templates/web/base/admin/users.html:16 +#: templates/web/base/admin/users/import.html:23 +#: templates/web/base/admin/users/import.html:46 +#: templates/web/base/admin/users/index.html:16 #: templates/web/base/report/form/user_name.html:2 -#: templates/web/zurich/admin/body-form.html:4 +#: templates/web/zurich/admin/bodies/form.html:4 #: templates/web/zurich/auth/general.html:43 #: templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" @@ -2156,7 +2172,7 @@ msgstr "名字" #: templates/web/base/admin/report_edit.html:135 #: templates/web/base/admin/responsepriorities/edit.html:13 #: templates/web/base/admin/update_edit.html:34 -#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/base/admin/users/form.html:16 templates/web/base/my/my.html:35 #: templates/web/zurich/admin/stats/index.html:62 msgid "Name:" msgstr "名字：" @@ -2166,11 +2182,11 @@ msgstr "名字：" msgid "Names are limited to %d characters in length." msgstr "" -#: templates/web/base/report/_inspect.html:50 +#: templates/web/base/report/_inspect.html:53 msgid "Navigate to this problem" msgstr "" -#: templates/web/base/report/_inspect.html:45 +#: templates/web/base/report/_inspect.html:48 msgid "Nearest calculated address:" msgstr "" @@ -2182,7 +2198,7 @@ msgstr "找出地圖標記上最近的街道名稱(利用 OpenStreetMap自動産 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "找出地圖標記上最近的郵遞區號(自動産生): %s(%sm away)" -#: perllib/FixMyStreet/Cobrand/Default.pm:570 +#: perllib/FixMyStreet/Cobrand/Default.pm:562 #: perllib/FixMyStreet/Geocode/Address.pm:17 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "找出地圖標記上最近的街道(利用 Bing Maps自動産生): %s" @@ -2208,11 +2224,11 @@ msgstr "差不多快完成了，現在檢查您的電子信箱" msgid "Nearly done! Now check your phone…" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:242 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:73 msgid "New body added" msgstr "新增內文" -#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:296 msgid "New category contact added" msgstr "新增類別承辦 人" @@ -2248,23 +2264,23 @@ msgstr "" msgid "New priority" msgstr "" -#: templates/web/base/admin/user-alerts.html:44 +#: templates/web/base/admin/users/alerts.html:44 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:42 +#: templates/web/base/admin/users/alerts.html:42 msgid "New problems for %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:35 +#: templates/web/base/admin/users/alerts.html:35 msgid "New problems for %s ward in %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:47 +#: templates/web/base/admin/users/alerts.html:47 msgid "New problems for area id %s" msgstr "" -#: templates/web/base/admin/user-alerts.html:37 +#: templates/web/base/admin/users/alerts.html:37 msgid "New problems for ward id %s in body id %s" msgstr "" @@ -2272,7 +2288,7 @@ msgstr "" msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" msgstr "FixMyStreet上{{里/區}}{{地方政府}} 之新近問題" -#: templates/web/base/admin/user-alerts.html:30 +#: templates/web/base/admin/users/alerts.html:30 msgid "New problems near %s,%s" msgstr "" @@ -2308,11 +2324,11 @@ msgstr "新陳述" msgid "New template" msgstr "新模版" -#: templates/web/base/admin/user-alerts.html:28 +#: templates/web/base/admin/users/alerts.html:28 msgid "New updates on report %s" msgstr "" -#: templates/web/base/reports/_list-filters.html:75 +#: templates/web/base/reports/_list-filters.html:80 msgid "Newest" msgstr "" @@ -2324,10 +2340,10 @@ msgstr "下一步" msgid "Next:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1214 +#: perllib/FixMyStreet/Cobrand/Default.pm:1201 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:116 #: perllib/FixMyStreet/DB/Result/ModerationOriginalData.pm:117 -#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/bodies/category.html:5 #: templates/web/base/admin/list_updates.html:33 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/list_updates.html:36 @@ -2335,11 +2351,10 @@ msgstr "" #: templates/web/base/admin/report_edit.html:133 #: templates/web/base/admin/report_edit.html:96 #: templates/web/base/admin/update_edit.html:26 -#: templates/web/base/admin/user-alerts.html:21 -#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/admin/users/alerts.html:21 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:39 -#: templates/web/base/report/_inspect.html:113 +#: templates/web/base/report/_inspect.html:116 msgid "No" msgstr "無" @@ -2347,11 +2362,7 @@ msgstr "無" msgid "No account?" msgstr "" -#: templates/web/base/admin/user-form.html:84 -msgid "No area" -msgstr "" - -#: templates/web/base/admin/user-form.html:52 +#: templates/web/base/admin/users/form.html:52 msgid "No body" msgstr "無有關單位" @@ -2359,7 +2370,7 @@ msgstr "無有關單位" msgid "No council selected" msgstr "未選擇地方政府" -#: templates/web/base/admin/edit-league.html:17 +#: templates/web/base/admin/bodies/edit-league.html:17 msgid "No edits have yet been made." msgstr "尚未編 輯申報內容" @@ -2376,11 +2387,11 @@ msgstr "未發現標記警告用戶" msgid "No further updates" msgstr "尚無更新" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections by that inspector in the selected date range." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 +#: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:72 msgid "No inspections in the selected date range." msgstr "" @@ -2388,12 +2399,12 @@ msgstr "" msgid "No reports to show on map, here are some nearby:" msgstr "" -#: templates/web/base/js/translation_strings.html:48 +#: templates/web/base/js/translation_strings.html:54 msgid "No result returned" msgstr "查無結果" -#: templates/web/base/admin/body-form.html:68 -#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/bodies/form.html:68 +#: templates/web/base/admin/bodies/form.html:69 msgid "" "No specific areas are currently available, because the MAPIT_URL in\n" " your config file is not pointing to a live MapIt service." @@ -2412,15 +2423,15 @@ msgstr "無支援" msgid "None" msgstr "沒有" -#: templates/web/base/admin/user-form.html:76 -#: templates/web/base/admin/user-form.html:77 +#: templates/web/base/admin/users/form.html:76 +#: templates/web/base/admin/users/form.html:77 msgid "" "Normal (public) users should not be associated with any area.
\n" " Authorised staff users can be associated with the area in which they operate." msgstr "" -#: templates/web/base/admin/user-form.html:42 -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/users/form.html:42 +#: templates/web/base/admin/users/form.html:43 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2444,13 +2455,13 @@ msgstr "之前未申報過" msgid "Not reported to council" msgstr "未呈報給地方政府" -#: templates/web/base/admin/body.html:75 -#: templates/web/base/admin/category_edit.html:31 -#: templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/bodies/body.html:76 +#: templates/web/base/admin/bodies/category.html:32 +#: templates/web/zurich/admin/bodies/body.html:17 msgid "Note" msgstr "註記" -#: templates/web/zurich/admin/contact-form.html:45 +#: templates/web/zurich/admin/bodies/contact-form.html:45 msgid "Note:" msgstr "註記:" @@ -2474,15 +2485,15 @@ msgstr "" msgid "Number of problems reported in each ward, in the last 7 days." msgstr "" -#: templates/web/base/js/translation_strings.html:54 +#: templates/web/base/js/translation_strings.html:60 msgid "OK" msgstr "好了" -#: templates/web/base/js/translation_strings.html:91 +#: templates/web/base/js/translation_strings.html:97 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:88 +#: templates/web/base/js/translation_strings.html:94 msgid "Offline update data saved" msgstr "" @@ -2490,16 +2501,16 @@ msgstr "" msgid "Old state" msgstr "舊陳述" -#: templates/web/base/reports/_list-filters.html:76 +#: templates/web/base/reports/_list-filters.html:81 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/SendReport/Email.pm:91 +#: perllib/FixMyStreet/SendReport/Email.pm:94 msgid "On behalf of %s" msgstr "" #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:178 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:156 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:154 #: perllib/FixMyStreet/DB/ResultSet/State.pm:70 #: templates/web/base/admin/states/index.html:102 #: templates/web/base/admin/states/index.html:25 @@ -2510,7 +2521,7 @@ msgstr "" msgid "Open" msgstr "開放" -#: templates/web/base/admin/open311-form-fields.html:47 +#: templates/web/base/admin/bodies/open311-form-fields.html:47 msgid "Open311 API Key" msgstr "" @@ -2518,7 +2529,7 @@ msgstr "" msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API for the mySociety FixMyStreet server" -#: templates/web/base/admin/open311-form-fields.html:34 +#: templates/web/base/admin/bodies/open311-form-fields.html:34 msgid "Open311 Jurisdiction" msgstr "" @@ -2550,17 +2561,17 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1328 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:711 #: perllib/FixMyStreet/App/Controller/Report/New.pm:712 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:713 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:748 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:751 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:750 #: perllib/FixMyStreet/DB/Result/Problem.pm:605 #: perllib/FixMyStreet/DB/Result/Problem.pm:612 #: perllib/FixMyStreet/DB/Result/Problem.pm:627 #: perllib/FixMyStreet/DB/Result/Problem.pm:636 -#: perllib/FixMyStreet/Script/Reports.pm:182 -#: perllib/FixMyStreet/Script/Reports.pm:189 +#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:199 msgid "Other" msgstr "其它" @@ -2585,8 +2596,8 @@ msgstr "物主" msgid "Page Not Found" msgstr "找無此頁" -#: templates/web/base/admin/body-form.html:39 -#: templates/web/zurich/admin/body-form.html:14 +#: templates/web/base/admin/bodies/form.html:39 +#: templates/web/zurich/admin/bodies/form.html:14 msgid "Parent" msgstr "上級 " @@ -2600,19 +2611,19 @@ msgstr "部份" msgid "Password (optional)" msgstr "密碼(任選):" -#: templates/web/base/js/translation_strings.html:63 +#: templates/web/base/js/translation_strings.html:69 msgid "Permalink" msgstr "永久連結" -#: templates/web/base/admin/user-form.html:168 +#: templates/web/base/admin/users/form.html:170 msgid "Permissions:" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:61 +#: templates/web/base/admin/bodies/open311-form-fields.html:61 msgid "Permit blank updates" msgstr "" -#: templates/web/base/report/_inspect.html:25 +#: templates/web/base/report/_inspect.html:28 msgid "Phone Reporter:" msgstr "" @@ -2632,17 +2643,16 @@ msgstr "電話號碼(非必填)" msgid "Phone numbers are limited to %s characters in length." msgstr "" -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/users/form.html:29 msgid "Phone verified:" msgstr "" #: templates/web/base/admin/report_edit.html:143 -#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/base/admin/users/form.html:27 templates/web/base/my/my.html:47 #: templates/web/zurich/admin/stats/index.html:60 msgid "Phone:" msgstr "電話" -#: templates/web/base/admin/report_edit.html:198 #: templates/web/base/admin/update_edit.html:95 #: templates/web/base/questionnaire/index.html:78 #: templates/web/base/questionnaire/index.html:93 @@ -2653,6 +2663,7 @@ msgstr "電話" #: templates/web/base/report/update/form_update.html:22 #: templates/web/base/report/update/form_update.html:24 #: templates/web/base/report/update/form_update.html:7 +#: templates/web/base/report/update/moderation_diff.html:4 #: templates/web/zurich/admin/index-dm.html:29 #: templates/web/zurich/admin/index-sdm.html:24 #: templates/web/zurich/admin/reports.html:16 @@ -2667,7 +2678,7 @@ msgstr "照片" msgid "Photo is required." msgstr "要求提供照片" -#: templates/web/zurich/admin/contact-form.html:42 +#: templates/web/zurich/admin/bodies/contact-form.html:42 msgid "Photo required" msgstr "要求提供照片" @@ -2696,11 +2707,15 @@ msgstr "" msgid "Pick your ward" msgstr "" -#: templates/web/base/around/display_location.html:74 -#: templates/web/base/js/translation_strings.html:39 +#: templates/web/base/around/display_location.html:75 +#: templates/web/base/js/translation_strings.html:42 msgid "Place pin on map" msgstr "在地圖上作標記" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:143 +msgid "Please check their changes and resolve any differences." +msgstr "" + #: templates/web/base/report/new/notes.html:5 msgid "Please be polite, concise and to the point." msgstr "用語請遵守禮節，明確解釋問題 " @@ -2717,7 +2732,7 @@ msgstr "請再次確認您的密碼" msgid "Please check your email address is correct" msgstr "請確認您電郵地址無誤" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1432 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:426 #: perllib/FixMyStreet/DB/Result/User.pm:220 #: perllib/FixMyStreet/DB/Result/User.pm:221 #: templates/web/base/auth/_username_error.html:1 @@ -2725,11 +2740,11 @@ msgstr "請確認您電郵地址無誤" msgid "Please check your phone number is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:315 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:232 #: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 #: perllib/FixMyStreet/App/Controller/Report/New.pm:968 #: perllib/FixMyStreet/DB/Result/Problem.pm:388 -#: templates/web/base/js/translation_strings.html:16 +#: templates/web/base/js/translation_strings.html:19 msgid "Please choose a category" msgstr "請選擇類別" @@ -2738,8 +2753,9 @@ msgstr "請選擇類別" msgid "Please choose a less commonly-used password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:370 -#: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:287 +#: templates/web/base/admin/bodies/body.html:12 +#: templates/web/base/admin/bodies/index.html:4 #: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "請更正下方之錯誤" @@ -2758,13 +2774,13 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "請勿濫用本服務，濫用將造成您的政府輕視其它使用者之意見　" -#: perllib/FixMyStreet/App/Controller/Admin.pm:316 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:233 #: perllib/FixMyStreet/DB/Result/Comment.pm:149 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter a message" msgstr "請寫下您的留言" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1430 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:424 #: perllib/FixMyStreet/DB/Result/User.pm:223 #: perllib/FixMyStreet/DB/Result/User.pm:224 #: templates/web/base/auth/_username_error.html:1 @@ -2772,90 +2788,90 @@ msgstr "請寫下您的留言" msgid "Please enter a mobile number" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1458 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1577 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:214 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:95 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:501 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:390 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:26 #: templates/web/base/auth/change_password.html:29 -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:29 msgid "Please enter a password" msgstr "請輸入密碼" -#: perllib/FixMyStreet/App/Controller/Contact.pm:124 +#: perllib/FixMyStreet/App/Controller/Contact.pm:133 #: perllib/FixMyStreet/DB/Result/Problem.pm:371 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 msgid "Please enter a subject" msgstr "請填下主旨" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1455 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1568 -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:246 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:205 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:92 #: perllib/FixMyStreet/DB/Result/User.pm:213 -#: templates/web/base/js/translation_strings.html:19 -#: templates/web/base/js/translation_strings.html:23 +#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter a valid email" msgstr "請輸入有效電子郵件" #: perllib/FixMyStreet/App/Controller/Alert.pm:355 -#: perllib/FixMyStreet/App/Controller/Contact.pm:134 +#: perllib/FixMyStreet/App/Controller/Contact.pm:143 msgid "Please enter a valid email address" msgstr "請輸入有效的電子郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1462 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1562 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:199 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:99 msgid "Please enter a valid email or phone number" msgstr "" #: perllib/FixMyStreet/DB/Result/Problem.pm:374 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:12 msgid "Please enter some details" msgstr "請填寫進一步細節" -#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 #: perllib/FixMyStreet/DB/Result/User.pm:211 #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:8 #: templates/web/base/auth/change_email.html:24 #: templates/web/base/auth/change_email.html:26 -#: templates/web/base/js/translation_strings.html:18 -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/js/translation_strings.html:21 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your email" msgstr "請輸入您的電子郵件" -#: templates/web/base/js/translation_strings.html:35 +#: templates/web/base/js/translation_strings.html:38 msgid "Please enter your first name" msgstr "請輸入您的大名" -#: perllib/FixMyStreet/Cobrand/UK.pm:327 -#: templates/web/base/js/translation_strings.html:14 +#: perllib/FixMyStreet/Cobrand/UK.pm:330 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "請輸入您的全名，地方政府需要此資料 – 如果您不希望名字公開在網站上，請在下面方格中劃掉勾選。" -#: perllib/FixMyStreet/App/Controller/Contact.pm:122 +#: perllib/FixMyStreet/App/Controller/Contact.pm:131 #: perllib/FixMyStreet/DB/Result/Comment.pm:146 #: perllib/FixMyStreet/DB/Result/Problem.pm:382 #: perllib/FixMyStreet/DB/Result/User.pm:206 -#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:16 msgid "Please enter your name" msgstr "請輸入您的姓氐" #: templates/web/base/auth/_username_error.html:1 #: templates/web/base/auth/_username_error.html:6 -#: templates/web/base/js/translation_strings.html:32 +#: templates/web/base/js/translation_strings.html:35 msgid "Please enter your phone number" msgstr "請輸入您的電話號碼" -#: templates/web/base/js/translation_strings.html:36 +#: templates/web/base/js/translation_strings.html:39 msgid "Please enter your second name" msgstr "請輸入您的別名" -#: templates/web/base/js/translation_strings.html:34 +#: templates/web/base/js/translation_strings.html:37 msgid "Please enter your title" msgstr "請輸入您的稱呼" @@ -2883,7 +2899,7 @@ msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "請選擇您是否願意收到其它問卷" #: perllib/FixMyStreet/App/Controller/Auth.pm:410 -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/js/translation_strings.html:32 msgid "Please make sure your password is at least %d characters long" msgstr "" @@ -2909,11 +2925,11 @@ msgstr "" msgid "Please note:" msgstr "請加註記" -#: perllib/FixMyStreet/App/Controller/Report.pm:406 +#: perllib/FixMyStreet/App/Controller/Report.pm:445 msgid "Please provide a duplicate ID or public update for this report." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:388 +#: perllib/FixMyStreet/App/Controller/Report.pm:427 msgid "Please provide a public update for this report." msgstr "" @@ -2949,16 +2965,16 @@ msgstr "請敍明該問題是否已解決" #: perllib/FixMyStreet/App/Model/PhotoSet.pm:120 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:154 #: perllib/FixMyStreet/App/Model/PhotoSet.pm:156 -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:77 msgid "Please upload an image only" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1465 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:102 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:202 msgid "Please verify at least one of email/phone" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:125 +#: perllib/FixMyStreet/App/Controller/Contact.pm:134 msgid "Please write a message" msgstr "諘寫下您的留言" @@ -2994,12 +3010,12 @@ msgstr "Powered by msgid "Previous" msgstr "之前" -#: perllib/FixMyStreet/Cobrand/Default.pm:670 +#: perllib/FixMyStreet/Cobrand/Default.pm:662 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:144 -#: templates/web/base/report/_item.html:105 +#: templates/web/base/report/_inspect.html:147 +#: templates/web/base/report/_item.html:72 msgid "Priority" msgstr "" @@ -3013,14 +3029,18 @@ msgstr "隱私" msgid "Privacy and cookies" msgstr "隱私與cookies" -#: templates/web/base/admin/body.html:88 -#: templates/web/base/admin/contact-form.html:75 +#: templates/web/base/admin/bodies/body.html:89 +#: templates/web/base/admin/bodies/contact-form.html:75 #: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/report/_inspect.html:13 +#: templates/web/base/report/_inspect.html:16 #: templates/web/base/report/new/form_user_loggedin.html:67 msgid "Private" msgstr "私人" +#: templates/web/base/reports/_list-filters.html:28 +msgid "Private only" +msgstr "" + #: templates/web/base/maps/pin.html:14 msgid "Problem" msgstr "問題" @@ -3043,7 +3063,7 @@ msgstr "%s　問題已送達到地方政府　%s　" msgid "Problem breakdown by state" msgstr "本站出現故障問題　" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1388 +#: perllib/FixMyStreet/App/Controller/Admin.pm:921 msgid "Problem marked as open." msgstr "問題標註為開放" @@ -3051,7 +3071,7 @@ msgstr "問題標註為開放" msgid "Problem state change based on survey results" msgstr "依調查結果呈現的問題改善" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:707 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "問題" @@ -3076,7 +3096,7 @@ msgstr "FixMyStreet　最近回報的已修復問題　" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:855 +#: perllib/FixMyStreet/Cobrand/Default.pm:847 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:141 #: perllib/FixMyStreet/Cobrand/UK.pm:213 perllib/FixMyStreet/Cobrand/UK.pm:258 #: perllib/FixMyStreet/Cobrand/UK.pm:270 @@ -3101,8 +3121,8 @@ msgstr "在 %s, %s的問題　" msgid "Property address:" msgstr "公物地址：" -#: templates/web/base/report/display.html:66 #: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/update-form-wrapper.html:3 #: templates/web/base/report/update-form.html:9 msgid "Provide an update" msgstr "提供更新資訊" @@ -3128,7 +3148,7 @@ msgstr "" msgid "Public response:" msgstr "公眾反應" -#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_inspect.html:192 msgid "Public update:" msgstr "" @@ -3153,6 +3173,7 @@ msgid "Questionnaire %d sent for problem %d" msgstr "關於 %d問題所送出之 %d問卷 " #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:205 +#: templates/web/base/report/updates.html:17 msgid "Questionnaire filled in by problem reporter" msgstr "由問題申報者所填之問卷" @@ -3176,11 +3197,11 @@ msgstr "%s里/區 RSS訂閱" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:165 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:175 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:183 -#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:297 +#: perllib/FixMyStreet/Cobrand/UK.pm:285 perllib/FixMyStreet/Cobrand/UK.pm:299 msgid "RSS feed of %s" msgstr "%s RSS訂閱" -#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 +#: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:304 msgid "RSS feed of %s, within %s ward" msgstr "%s, 在%s 里/區" @@ -3188,7 +3209,7 @@ msgstr "%s, 在%s 里/區" msgid "RSS feed of nearby problems" msgstr " RSS訂閱 %s區域問題" -#: perllib/FixMyStreet/Cobrand/Default.pm:856 +#: perllib/FixMyStreet/Cobrand/Default.pm:848 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:140 #: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s" @@ -3208,6 +3229,14 @@ msgstr "最近當地問題的RSS訂閱" msgid "RSS feed of updates to this problem" msgstr "最近當地問題更新的RSS訂閱" +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read less" +msgstr "" + +#: templates/web/base/report/_item_expandable.html:50 +msgid "Read more" +msgstr "" + #: templates/web/base/alert/updates.html:14 #: templates/web/base/report/display_tools.html:44 msgid "Receive email when updates are left on this problem." @@ -3227,11 +3256,11 @@ msgstr "近期的當地問題%s　" msgid "Recently reported problems" msgstr "近期申報之問題　" -#: templates/web/base/reports/_list-filters.html:77 +#: templates/web/base/reports/_list-filters.html:82 msgid "Recently updated" msgstr "" -#: templates/web/base/report/_inspect.html:60 +#: templates/web/base/report/_inspect.html:63 msgid "Reject report" msgstr "" @@ -3243,7 +3272,7 @@ msgstr "記住 FixMyStreet主要為申報可修復之物理性問題。如果您 msgid "Remove" msgstr "" -#: templates/web/base/admin/user-form.html:203 +#: templates/web/base/admin/users/form.html:205 msgid "Remove account details" msgstr "" @@ -3257,9 +3286,9 @@ msgstr "移除標記" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:23 -#: templates/web/base/report/_main.html:31 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:24 +#: templates/web/base/report/_main.html:32 msgid "Remove from shortlist" msgstr "" @@ -3285,20 +3314,20 @@ msgstr "給用戶的回應" msgid "Report" msgstr "提報　" -#: templates/web/base/report/_inspect.html:17 -#: templates/web/base/report/_item.html:83 +#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_item.html:50 msgid "Report ID:" msgstr "" #: templates/web/base/header_logo.html:2 -#: templates/web/base/js/translation_strings.html:80 +#: templates/web/base/js/translation_strings.html:86 #: templates/web/base/main_nav_items.html:6 #: templates/web/base/main_nav_items.html:8 templates/web/zurich/footer.html:18 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "申報問題" -#: templates/web/base/js/translation_strings.html:81 +#: templates/web/base/js/translation_strings.html:87 #: templates/web/base/main_nav_items.html:4 msgid "Report a problem here" msgstr "" @@ -3308,7 +3337,7 @@ msgstr "" msgid "Report abuse" msgstr "申報濫用" -#: templates/web/base/js/translation_strings.html:82 +#: templates/web/base/js/translation_strings.html:88 #: templates/web/base/main_nav_items.html:2 #: templates/web/base/tokens/confirm_problem.html:40 msgid "Report another problem here" @@ -3342,17 +3371,18 @@ msgid "Report, view, or discuss local problems" msgstr "申報，檢視，或討論在地問題" #: perllib/FixMyStreet/DB/Result/Problem.pm:616 -#: templates/web/base/contact/index.html:58 +#: templates/web/base/contact/index.html:60 msgid "Reported anonymously at %s" msgstr "在%s 匿名申報 " #: templates/web/base/admin/stats/questionnaire.html:5 +#: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "之前的申報" #: perllib/FixMyStreet/DB/Result/Problem.pm:640 -#: templates/web/base/contact/index.html:60 +#: templates/web/base/contact/index.html:62 msgid "Reported by %s at %s" msgstr "由%s 的 %s 申報" @@ -3396,28 +3426,28 @@ msgstr "已申報 %s" #: templates/web/base/around/index.html:3 #: templates/web/base/around/lookup_by_ref.html:3 -#: templates/web/base/js/translation_strings.html:53 +#: templates/web/base/js/translation_strings.html:59 #: templates/web/base/report/new/fill_in_details.html:0 -#: templates/web/base/report/new/fill_in_details.html:8 +#: templates/web/base/report/new/fill_in_details.html:10 #: templates/web/zurich/report/new/fill_in_details_form.html:4 msgid "Reporting a problem" msgstr "申報問題" -#: perllib/FixMyStreet/Cobrand/Default.pm:660 -#: perllib/FixMyStreet/Cobrand/Default.pm:674 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:402 +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:666 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:400 #: templates/web/base/dashboard/index.html:107 #: templates/web/zurich/header.html:45 msgid "Reports" msgstr "申報" -#: perllib/FixMyStreet/Cobrand/Bromley.pm:17 +#: perllib/FixMyStreet/Cobrand/Bromley.pm:21 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:17 #: perllib/FixMyStreet/Roles/ConfirmValidation.pm:32 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "申請內容有　%s 字數限制，請簡化您的申報。" -#: templates/web/base/js/translation_strings.html:10 +#: templates/web/base/js/translation_strings.html:13 msgid "Reports are limited to {0} characters in length. Please shorten your report" msgstr "" @@ -3429,7 +3459,7 @@ msgstr "待核實之申報" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:128 +#: templates/web/base/admin/users/form.html:130 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3441,15 +3471,15 @@ msgstr "" msgid "Reports published" msgstr "己公開之申報" -#: templates/web/base/js/translation_strings.html:92 +#: templates/web/base/js/translation_strings.html:98 msgid "Reports saved offline." msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:296 +#: perllib/FixMyStreet/Cobrand/UK.pm:284 perllib/FixMyStreet/Cobrand/UK.pm:298 msgid "Reports sent to %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:305 msgid "Reports sent to %s, within %s ward" msgstr "" @@ -3457,11 +3487,11 @@ msgstr "" msgid "Reports waiting to be sent" msgstr "" -#: templates/web/base/admin/contact-form.html:90 +#: templates/web/base/admin/bodies/contact-form.html:90 msgid "Reports will automatically be sent without needing to be inspected if the user's reputation is at or above this value. Set to 0 if all reports must be inspected regardless." msgstr "" -#: templates/web/base/admin/contact-form.html:95 +#: templates/web/base/admin/bodies/contact-form.html:95 msgid "Reputation threshold" msgstr "" @@ -3501,20 +3531,20 @@ msgstr "" msgid "Response Templates for %s" msgstr "%s的回應模版" -#: templates/web/base/report/update.html:42 +#: templates/web/base/report/update.html:44 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:105 +#: templates/web/base/report/_main.html:111 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:54 +#: templates/web/base/report/_main.html:60 msgid "Revert to original title" msgstr "" -#: templates/web/base/js/translation_strings.html:37 -#: templates/web/base/js/translation_strings.html:51 +#: templates/web/base/js/translation_strings.html:40 +#: templates/web/base/js/translation_strings.html:57 msgid "Right place?" msgstr "正確地點？" @@ -3526,15 +3556,15 @@ msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 -#: perllib/FixMyStreet/App/Controller/Admin.pm:2161 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1093 #: templates/web/base/admin/report_edit.html:166 #: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "左轉　" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2157 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1089 #: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/update_edit.html:72 #: templates/web/zurich/admin/report_edit.html:119 @@ -3545,23 +3575,23 @@ msgstr "右轉　" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "旋轉這張照片將會導致申報中未存檔的照片更動消失" -#: templates/web/base/js/translation_strings.html:58 +#: templates/web/base/js/translation_strings.html:64 #: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "衛星" -#: templates/web/base/report/_inspect.html:209 +#: templates/web/base/report/_inspect.html:212 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:156 +#: templates/web/base/admin/bodies/contact-form.html:156 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 #: templates/web/base/admin/template_edit.html:87 -#: templates/web/base/report/_inspect.html:209 -#: templates/web/base/report/_main.html:123 -#: templates/web/base/report/update.html:56 -#: templates/web/zurich/admin/contact-form.html:49 +#: templates/web/base/report/_inspect.html:212 +#: templates/web/base/report/_main.html:129 +#: templates/web/base/report/update.html:58 +#: templates/web/zurich/admin/bodies/contact-form.html:49 #: templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "儲存變動" @@ -3570,12 +3600,12 @@ msgstr "儲存變動" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:185 +#: templates/web/base/report/_inspect.html:188 msgid "Save with a public update" msgstr "" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:93 +#: templates/web/base/js/translation_strings.html:99 msgid "Saving reports offline" msgstr "" @@ -3585,7 +3615,8 @@ msgstr "" msgid "Search Reports" msgstr "搜尋申報" -#: templates/web/base/admin/index.html:32 templates/web/base/admin/users.html:1 +#: templates/web/base/admin/index.html:32 +#: templates/web/base/admin/users/index.html:1 msgid "Search Users" msgstr "搜尋使用者" @@ -3594,7 +3625,7 @@ msgid "Search reports" msgstr "搜尋申報" #: templates/web/base/admin/reports.html:5 -#: templates/web/base/admin/users.html:8 +#: templates/web/base/admin/users/index.html:8 #: templates/web/zurich/admin/reports.html:5 msgid "Search:" msgstr "搜尋" @@ -3604,7 +3635,7 @@ msgstr "搜尋" msgid "Searching found no reports." msgstr "查無此申報" -#: templates/web/base/admin/users.html:42 +#: templates/web/base/admin/users/index.html:42 msgid "Searching found no users." msgstr "查無此用戶" @@ -3620,17 +3651,18 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:721 msgid "See user detail for reports created as the council" msgstr "" -#: templates/web/base/admin/body-form.html:41 -#: templates/web/zurich/admin/body-form.html:16 +#: templates/web/base/admin/bodies/form.html:41 +#: templates/web/zurich/admin/bodies/form.html:16 msgid "Select a body" msgstr "選擇單位" -#: templates/web/base/admin/body-form.html:78 -#: templates/web/zurich/admin/body-form.html:25 +#: templates/web/base/admin/bodies/form.html:78 +#: templates/web/base/admin/users/form.html:84 +#: templates/web/zurich/admin/bodies/form.html:25 msgid "Select an area" msgstr "選擇區域" @@ -3650,15 +3682,15 @@ msgstr "" msgid "Select:" msgstr "" -#: templates/web/base/contact/index.html:114 +#: templates/web/base/contact/index.html:116 msgid "Send" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:121 +#: templates/web/base/admin/bodies/open311-form-fields.html:121 msgid "Send extended Open311 statuses with service request updates" msgstr "" -#: templates/web/base/admin/user-form.html:22 +#: templates/web/base/admin/users/form.html:22 msgid "Send login email" msgstr "" @@ -3667,7 +3699,7 @@ msgstr "" msgid "Sending a confirmation text failed: \"%s\"" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:874 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:872 msgid "Sent report back" msgstr "送回申報" @@ -3694,7 +3726,7 @@ msgstr "服務" msgid "Set password" msgstr "" -#: templates/web/base/report/_inspect.html:53 +#: templates/web/base/report/_inspect.html:56 msgid "Set to my current location" msgstr "" @@ -3703,9 +3735,9 @@ msgid "Share" msgstr "分享" #: templates/web/base/main_nav_items.html:18 -#: templates/web/base/report/_main.html:143 -#: templates/web/base/report/_main.html:26 -#: templates/web/base/report/_main.html:34 +#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:27 +#: templates/web/base/report/_main.html:35 msgid "Shortlist" msgstr "" @@ -3713,15 +3745,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:141 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:147 +#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:31 #: templates/web/base/reports/_list-filters.html:24 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:151 +#: templates/web/base/report/_main.html:157 msgid "Shortlisted by %s" msgstr "" @@ -3733,7 +3765,7 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/_show_name_label.html:4 +#: templates/web/base/report/_show_name_label.html:3 msgid "Show my name publicly" msgstr "公開我的姓名" @@ -3745,21 +3777,21 @@ msgstr "" msgid "Show older" msgstr "" -#: templates/web/base/reports/_list-filters.html:85 +#: templates/web/base/reports/_list-filters.html:90 msgid "Show older reports" msgstr "" -#: templates/web/base/report/_main.html:89 +#: templates/web/base/report/_main.html:95 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:58 -#: templates/web/base/around/display_location.html:66 -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/around/display_location.html:59 +#: templates/web/base/around/display_location.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Show pins" msgstr "顯示地圖標示" -#: templates/web/base/report/_main.html:66 +#: templates/web/base/report/_main.html:72 msgid "Show reporter’s name" msgstr "" @@ -3802,8 +3834,8 @@ msgstr "登出" msgid "Some categories may require additional information." msgstr "某些類別要求其它資訊" -#: templates/web/base/admin/open311-form-fields.html:40 -#: templates/web/base/admin/open311-form-fields.html:41 +#: templates/web/base/admin/bodies/open311-form-fields.html:40 +#: templates/web/base/admin/bodies/open311-form-fields.html:41 msgid "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -3821,6 +3853,14 @@ msgstr "最近申報之照片" msgid "Some text to localize" msgstr "有些文字需在地化" +#: perllib/FixMyStreet/App/Controller/Moderate.pm:142 +msgid "Someone has moderated this report since you started." +msgstr "" + +#: templates/web/base/js/translation_strings.html:74 +msgid "Sorry! You’ve hit the limit of images that can be attached to one report." +msgstr "" + #: perllib/FixMyStreet/Cobrand/UK.pm:80 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "抱歉，該郵區號碼我們尚未支援" @@ -3838,7 +3878,7 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "抱歉無法確認你的問題" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:244 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:243 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:40 #: perllib/FixMyStreet/Geocode/OSM.pm:52 msgid "Sorry, we could not find that location." @@ -3860,7 +3900,7 @@ msgstr "抱歉，我們無法解析此地點，請重試一次" msgid "Sorry, we couldn't save your image(s), please try again." msgstr "抱歉，我們無法儲存你的照片，請重試一次" -#: templates/web/base/offline/appcache.html:5 +#: templates/web/base/offline/appcache.html:6 msgid "" "Sorry, we don’t have a good enough connection to fetch that page, or the\n" "page wasn’t found or there was a server error. Please try again later." @@ -3870,15 +3910,15 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:70 +#: templates/web/base/reports/_list-filters.html:75 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:62 +#: templates/web/base/admin/users/form.html:62 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/users/form.html:66 msgid "Staff:" msgstr "" @@ -3886,31 +3926,32 @@ msgstr "" msgid "Start Date" msgstr "" -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:29 -#: templates/web/base/admin/contact-form.html:53 +#: templates/web/base/admin/bodies/body.html:74 +#: templates/web/base/admin/bodies/category.html:30 +#: templates/web/base/admin/bodies/contact-form.html:53 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/index.html:64 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:16 #: templates/web/base/admin/template_edit.html:53 #: templates/web/base/admin/templates.html:8 -#: templates/web/base/admin/user-alerts.html:11 +#: templates/web/base/admin/users/alerts.html:11 #: templates/web/base/dashboard/index.html:101 -#: templates/web/base/report/_inspect.html:103 -#: templates/web/base/report/_item.html:101 +#: templates/web/base/report/_inspect.html:106 +#: templates/web/base/report/_item.html:68 #: templates/web/base/report/update/form_update.html:41 -#: templates/web/zurich/admin/contact-form.html:33 +#: templates/web/zurich/admin/bodies/contact-form.html:33 msgid "State" msgstr "陳述" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1215 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1216 +#: perllib/FixMyStreet/App/Controller/Admin.pm:791 +#: perllib/FixMyStreet/App/Controller/Admin.pm:792 msgid "State and external status code cannot be used simultaneously." msgstr "" #: perllib/FixMyStreet/Script/Alerts.pm:102 #: templates/web/base/report/_update_state.html:7 +#: templates/web/base/report/updates.html:18 msgid "State changed to:" msgstr "" @@ -3923,14 +3964,14 @@ msgstr "" msgid "State:" msgstr "陳述:" -#: perllib/FixMyStreet/Cobrand/Default.pm:649 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:423 +#: perllib/FixMyStreet/Cobrand/Default.pm:641 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:421 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:643 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:405 +#: perllib/FixMyStreet/Cobrand/Default.pm:635 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:403 #: templates/web/base/admin/index.html:71 #: templates/web/base/admin/stats/index.html:1 #: templates/web/base/admin/stats/state.html:1 @@ -3946,7 +3987,7 @@ msgid "Status" msgstr "狀態" #: templates/web/base/report/_update_state.html:22 -#: templates/web/base/report/updates.html:16 +#: templates/web/base/report/updates.html:22 msgid "Still open, via questionnaire" msgstr "" @@ -3959,7 +4000,7 @@ msgstr "街景圖" msgid "String" msgstr "" -#: templates/web/base/report/new/category.html:38 +#: templates/web/base/report/new/category.html:46 msgid "Subcategory" msgstr "" @@ -3967,12 +4008,12 @@ msgstr "" msgid "Subdivision/Body" msgstr "下屬單位/機關" -#: templates/web/base/contact/index.html:97 +#: templates/web/base/contact/index.html:99 msgid "Subject" msgstr "主旨" #: templates/web/base/admin/report_edit.html:117 -#: templates/web/base/admin/report_edit.html:196 +#: templates/web/base/report/update/moderation_diff.html:2 #: templates/web/zurich/admin/report_edit.html:41 msgid "Subject:" msgstr "主旨:" @@ -3990,7 +4031,7 @@ msgstr "送出" #: templates/web/base/admin/report_edit.html:180 #: templates/web/base/admin/report_edit.html:25 #: templates/web/base/admin/update_edit.html:82 -#: templates/web/base/admin/user-form.html:195 +#: templates/web/base/admin/users/form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:265 #: templates/web/zurich/admin/update_edit.html:38 @@ -4011,7 +4052,8 @@ msgstr "已送出" #: templates/web/base/alert/_list.html:77 #: templates/web/base/alert/_list.html:80 #: templates/web/base/alert/updates.html:23 -#: templates/web/base/report/display_tools.html:51 +#: templates/web/base/report/display_tools.html:47 +#: templates/web/base/report/display_tools.html:52 msgid "Subscribe" msgstr "訂閱" @@ -4019,21 +4061,29 @@ msgstr "訂閱" msgid "Subscribe by email" msgstr "" -#: templates/web/base/admin/user-alerts.html:22 +#: templates/web/base/admin/users/alerts.html:22 msgid "Subscribed:" msgstr "" +#: perllib/FixMyStreet/Cobrand/Northamptonshire.pm:101 +msgid "Summaries are limited to %s characters in length. Please shorten your summary" +msgstr "" + +#: templates/web/base/js/translation_strings.html:9 +msgid "Summaries are limited to {0} characters in length. Please shorten your summary" +msgstr "" + #: templates/web/base/report/new/form_title.html:1 msgid "Summarise the problem" msgstr "" -#: templates/web/base/admin/contact-form.html:148 +#: templates/web/base/admin/bodies/contact-form.html:148 msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:641 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:401 -#: templates/web/base/admin/bodies.html:29 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:399 +#: templates/web/base/admin/bodies/index.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 #: templates/web/base/status/index.html:3 #: templates/web/zurich/admin/index-dm.html:1 @@ -4053,11 +4103,11 @@ msgstr "申報摘要" msgid "Summary statistics" msgstr "" -#: templates/web/base/admin/user-form.html:155 +#: templates/web/base/admin/users/form.html:157 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/users/form.html:153 msgid "Superusers have permission to perform all actions within the admin." msgstr "" @@ -4075,8 +4125,8 @@ msgstr "" msgid "Template «%s»" msgstr "模版 «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:666 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:412 +#: perllib/FixMyStreet/Cobrand/Default.pm:658 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:410 #: templates/web/base/develop/email_list.html:3 #: templates/web/zurich/header.html:62 msgid "Templates" @@ -4086,7 +4136,7 @@ msgstr "模版" msgid "Text" msgstr "內文" -#: templates/web/base/admin/body.html:32 +#: templates/web/base/admin/bodies/body.html:33 msgid "Text only version" msgstr "文字版" @@ -4130,7 +4180,7 @@ msgstr "謝謝，很高興知道此問題己修復了。請問您過去是否曾 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "照片上傳似乎無法正常 (%s), 請再試一次。 " -#: perllib/FixMyStreet/App/Controller/Council.pm:110 +#: perllib/FixMyStreet/App/Controller/Council.pm:105 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "該地區似乎非該地方政府管轄，它可能在轄區外，請再試 一次 " @@ -4144,11 +4194,11 @@ msgstr "這地點似乎不在台灣; 請再試 一次。" msgid "That postcode was not recognised, sorry." msgstr "抱歉此郵遞區號無法辨識" -#: perllib/FixMyStreet/App/Controller/Admin.pm:918 +#: perllib/FixMyStreet/App/Controller/Admin.pm:495 msgid "That problem has been marked as sent." msgstr "問題被標註為送出" -#: perllib/FixMyStreet/App/Controller/Admin.pm:911 +#: perllib/FixMyStreet/App/Controller/Admin.pm:488 msgid "That problem will now be resent." msgstr "此問題將重新送出" @@ -4160,23 +4210,23 @@ msgstr "此申報無法在 %s上檢視　" msgid "That report has been removed from FixMyStreet." msgstr "該申報已遭FixMyStreet 移除　" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1986 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:486 msgid "That user has been logged out." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1993 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:493 msgid "That user has been made anonymous on all reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2041 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:541 msgid "That user’s personal details have been removed." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2007 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:507 msgid "That user’s reports and updates have been hidden." msgstr "" -#: templates/web/base/admin/contact-form.html:27 +#: templates/web/base/admin/bodies/contact-form.html:27 msgid "" "The email address is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." @@ -4184,8 +4234,8 @@ msgstr "" "此 電子郵件 為此類別申報所將送出的對象\n" "該主責單位負責的其它類別可能也會使用同一電子郵件" -#: templates/web/base/admin/open311-form-fields.html:14 -#: templates/web/base/admin/open311-form-fields.html:15 +#: templates/web/base/admin/bodies/open311-form-fields.html:14 +#: templates/web/base/admin/bodies/open311-form-fields.html:15 msgid "" "The endpoint is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -4193,15 +4243,15 @@ msgstr "" "此端點 FixMyStreet 服務連結，\n" "當申報送出給該機關時，就會連結到此。" -#: templates/web/base/admin/contact-form.html:126 -#: templates/web/base/admin/contact-form.html:127 +#: templates/web/base/admin/bodies/contact-form.html:126 +#: templates/web/base/admin/bodies/contact-form.html:127 msgid "" "The group is used for the top-level category field when\n" " subcategory grouping is enabled." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:27 -#: templates/web/base/admin/open311-form-fields.html:28 +#: templates/web/base/admin/bodies/open311-form-fields.html:27 +#: templates/web/base/admin/bodies/open311-form-fields.html:28 msgid "" "The jurisdiction is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." @@ -4209,10 +4259,10 @@ msgstr "" "此管轄區 功能只有在終端不只一個\n" "時才會用到。如果機關自行營運用終端，此處功能可以不選留白　" -#: templates/web/base/admin/body-form.html:101 -#: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/contact-form.html:104 -#: templates/web/base/admin/contact-form.html:105 +#: templates/web/base/admin/bodies/contact-form.html:104 +#: templates/web/base/admin/bodies/contact-form.html:105 +#: templates/web/base/admin/bodies/form.html:101 +#: templates/web/base/admin/bodies/form.html:102 msgid "" "The send method determines how problem reports will be sent to the body.\n" " If you leave this blank, send method defaults to email." @@ -4224,8 +4274,8 @@ msgstr "" msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." msgstr " Open311 v2 的權責單位適用於對接收問題申報機關，但不受限於Open311 v2 規範定義。" -#: templates/web/base/admin/body-form.html:17 -#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/bodies/form.html:17 +#: templates/web/base/admin/bodies/form.html:18 msgid "" "The body's name identifies the body (for example, Borsetshire District Council)\n" " and may be displayed publically." @@ -4242,12 +4292,12 @@ msgstr "" msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." msgstr "地方政府可能無法協助，除非您留下問題的詳細細節。請仔細描述問題的明確地點(例如哪裏的牆面)，什樣樣的問題以及多久了，具體情況描述(如果有照片更佳)等等" -#: templates/web/base/admin/edit-league.html:3 -#: templates/web/base/admin/edit-league.html:4 +#: templates/web/base/admin/bodies/edit-league.html:3 +#: templates/web/base/admin/bodies/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "這個勤奮表單顯示用戶的活動(誰做了做多的修改編輯活動)" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:45 #: perllib/FixMyStreet/App/Controller/Reports.pm:58 msgid "The error was: %s" msgstr "顯示錯誤為: %s" @@ -4293,7 +4343,7 @@ msgstr "用戶申報{{NAME}}地區內地的最新問題" msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "這連結可能失效了或者你並未正確地複制貼上它" -#: templates/web/base/admin/body-form.html:66 +#: templates/web/base/admin/bodies/form.html:66 msgid "The list of available areas is being provided by the MapIt service at %s." msgstr "%s 區域中，MapIt服務涵蓋的範圍清單" @@ -4314,20 +4364,20 @@ msgstr "找不到您所要求的網頁連結。" msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." msgstr "" -#: templates/web/base/admin/user_import.html:68 +#: templates/web/base/admin/users/import.html:68 msgid "The uploaded CSV file must contain a header row, and records must have the following fields (in this order):" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:99 +#: perllib/FixMyStreet/Script/Reports.pm:98 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "用戶無法在地點上標示問題，但可以看到他們輸入的地點" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2032 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:532 msgid "The user has been sent a login email" msgstr "" -#: templates/web/base/admin/user-form.html:10 -#: templates/web/base/admin/user-form.html:11 +#: templates/web/base/admin/users/form.html:10 +#: templates/web/base/admin/users/form.html:11 msgid "" "The user's name is displayed publicly on reports that have not been marked anonymous.\n" " Names are not necessarily unique." @@ -4341,7 +4391,11 @@ msgstr "" msgid "There are no reports to show." msgstr "沒有申報可顯示" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1243 +#: templates/web/base/report/new/duplicate_suggestions.html:10 +msgid "There are similar problems nearby that we’re already aware of, is one of them yours?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:819 msgid "There is already an auto-response template for this category/state." msgstr "" @@ -4349,8 +4403,8 @@ msgstr "" msgid "There was a problem showing the All Reports page. Please try again later." msgstr "本頁現在無法願現所要求的申報資料，請稍候再試。" -#: perllib/FixMyStreet/App/Controller/Contact.pm:147 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +#: perllib/FixMyStreet/App/Controller/Contact.pm:156 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:44 msgid "There was a problem showing this page. Please try again later." msgstr "本頁出現錯誤，請再試一次" @@ -4372,7 +4426,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "您的申報有問題，請重試一次" -#: perllib/FixMyStreet/App/Controller/Contact.pm:151 +#: perllib/FixMyStreet/App/Controller/Contact.pm:160 msgid "There were problems with your report. Please see below." msgstr "您的申報有問題，請見下方說明" @@ -4389,8 +4443,8 @@ msgstr "" msgid "These details will never be shown online without your permission." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:3 -#: templates/web/base/admin/open311-form-fields.html:4 +#: templates/web/base/admin/bodies/open311-form-fields.html:3 +#: templates/web/base/admin/bodies/open311-form-fields.html:4 msgid "" "These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.
\n" " You don't need to set them if the Send Method is email..\n" @@ -4403,7 +4457,7 @@ msgstr "" "有關Open311的更多資訊請見\n" "本文" -#: templates/web/base/admin/user_import.html:43 +#: templates/web/base/admin/users/import.html:43 msgid "These users weren't updated." msgstr "" @@ -4421,7 +4475,7 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "此API執行正在安裝中尚未完全，未來將作無預警的更動" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/bodies/body.html:49 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported at any location.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" @@ -4432,12 +4486,12 @@ msgstr "" "因此它下方的類別不會出現用戶申報問題的下拉選單上。\n" "目前用戶無法用此單位申報問題." -#: templates/web/base/admin/body.html:58 +#: templates/web/base/admin/bodies/body.html:59 msgid "This body has no contacts. This means that currently problems reported to this body will not be sent." msgstr "該單位無聯絡人，此表示目前送至該單位的申報將無法送出." -#: templates/web/base/admin/body-form.html:60 -#: templates/web/base/admin/body-form.html:61 +#: templates/web/base/admin/bodies/form.html:60 +#: templates/web/base/admin/bodies/form.html:61 msgid "" "This body will only be sent reports for problems that are located in the area covered.\n" " A body will not receive any reports unless it covers at least one area." @@ -4445,18 +4499,17 @@ msgstr "" "此單位只涵蓋 負責區域的申報問題處理。　\n" "除非其涵蓋至少一個區域，否則政府單位不會接收到問題申報　" -#: perllib/FixMyStreet/Script/Reports.pm:190 +#: perllib/FixMyStreet/Script/Reports.pm:200 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "當用戶沒有選擇類別時，電子郵件將送到負責該區域的各地方政府。如果您不是該問題的受理機關，請略過，或讓我們知道該問題的類別以在系統作修正。" -#: perllib/FixMyStreet/Script/Reports.pm:193 +#: perllib/FixMyStreet/Script/Reports.pm:203 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "電子郵件將送到負責該區域的多個地方政府，因選擇的類別提供這些對象。如果您不是負責受理機關，請略過。" #: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1078 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1095 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1141 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1081 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1127 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "本項資訊必填" @@ -4473,7 +4526,11 @@ msgstr "本站為開發試用，可能隨時故障，資料庫也會定期刪除 msgid "This is the public text that will be shown on the site." msgstr "" -#: templates/web/base/admin/user_import.html:65 +#: templates/web/base/js/translation_strings.html:48 +msgid "This is the problem" +msgstr "" + +#: templates/web/base/admin/users/import.html:65 msgid "This page is a quick way to create many new staff users in one go." msgstr "" @@ -4489,12 +4546,16 @@ msgstr "問題尚未解決" msgid "This problem is still ongoing" msgstr "" +#: templates/web/base/js/translation_strings.html:47 +msgid "This report" +msgstr "" + #: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:142 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "此問題尚待審核" @@ -4515,7 +4576,7 @@ msgstr "該申報目前注記為開放狀態" msgid "This report is now closed to updates." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:90 +#: perllib/FixMyStreet/Script/Reports.pm:89 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "本頁包括由用戶提供反應問題的照片　" @@ -4526,7 +4587,7 @@ msgstr "本頁包括由用戶提供反應問題的照片　" msgid "Time spent (in minutes):" msgstr "花費時間(以分鐘計):" -#: perllib/FixMyStreet/Cobrand/Default.pm:642 +#: perllib/FixMyStreet/Cobrand/Default.pm:634 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "時間軸" @@ -4564,7 +4625,7 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:98 +#: perllib/FixMyStreet/Script/Reports.pm:97 msgid "To view a map of the precise location of this issue" msgstr "檢視地圖上問題之確切位置" @@ -4593,34 +4654,34 @@ msgstr "" msgid "Total" msgstr "總數" -#: templates/web/base/report/_inspect.html:155 -#: templates/web/base/report/_item.html:109 +#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_item.html:76 msgid "Traffic management required?" msgstr "" -#: templates/web/base/admin/_translations.html:7 +#: templates/web/base/admin/bodies/_translations.html:7 msgid "Translation" msgstr "" -#: templates/web/base/admin/_translations.html:2 +#: templates/web/base/admin/bodies/_translations.html:2 msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:132 +#: templates/web/base/admin/users/form.html:134 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:727 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:140 +#: templates/web/base/admin/users/form.html:142 msgid "Trusted:" msgstr "" #: templates/web/base/auth/2faform.html:6 #: templates/web/base/auth/smsform.html:17 -#: templates/web/base/js/translation_strings.html:38 +#: templates/web/base/js/translation_strings.html:41 msgid "Try again" msgstr "再試一次" @@ -4639,16 +4700,16 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:54 #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 -#: templates/web/base/admin/user-alerts.html:9 +#: templates/web/base/admin/users/alerts.html:9 msgid "Type" msgstr "" -#: templates/web/base/admin/user-form.html:34 +#: templates/web/base/admin/users/form.html:34 msgid "Unban" msgstr "" #: perllib/FixMyStreet/DB/ResultSet/State.pm:63 -#: templates/web/base/admin/contact-form.html:55 +#: templates/web/base/admin/bodies/contact-form.html:55 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/report_edit-sdm.html:66 #: templates/web/zurich/admin/report_edit.html:94 @@ -4666,7 +4727,7 @@ msgstr "未知的通知類別" #: perllib/FixMyStreet/App/Controller/Photo.pm:119 #: perllib/FixMyStreet/App/Controller/Root.pm:142 -#: templates/web/base/js/translation_strings.html:49 +#: templates/web/base/js/translation_strings.html:55 msgid "Unknown error" msgstr "未知的錯誤" @@ -4679,7 +4740,7 @@ msgstr "未知的錯誤" msgid "Unknown problem ID" msgstr "未知的問題編號　　" -#: perllib/FixMyStreet/App/Controller/Contact.pm:94 +#: perllib/FixMyStreet/App/Controller/Contact.pm:99 msgid "Unknown update ID" msgstr "" @@ -4692,7 +4753,7 @@ msgid "Up one" msgstr "" #: templates/web/base/admin/states/index.html:76 -#: templates/web/base/admin/user-alerts.html:58 +#: templates/web/base/admin/users/alerts.html:58 #: templates/web/base/report/update/form_update.html:31 msgid "Update" msgstr "更新" @@ -4701,16 +4762,16 @@ msgstr "更新" msgid "Update %s created for problem %d; by %s" msgstr "由%s 更新%s 申報之問題%s 　" -#: templates/web/base/contact/index.html:31 +#: templates/web/base/contact/index.html:33 msgid "Update below added anonymously at %s" msgstr "下方更新 為匿名提供%s" -#: templates/web/base/contact/index.html:33 +#: templates/web/base/contact/index.html:35 msgid "Update below added by %s at %s" msgstr "由%d 在 %s　所提供的更新" -#: templates/web/base/admin/body-form.html:139 -#: templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies/form.html:139 +#: templates/web/zurich/admin/bodies/form.html:51 msgid "Update body" msgstr "更新內文" @@ -4735,7 +4796,7 @@ msgstr "本問題已解決之更新標註" msgid "Update reopened problem" msgstr "更新重申報之問題　" -#: templates/web/base/admin/body.html:110 +#: templates/web/base/admin/bodies/body.html:111 msgid "Update statuses" msgstr "更新之狀態" @@ -4753,14 +4814,14 @@ msgstr "" msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1382 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1498 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1708 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1977 -#: perllib/FixMyStreet/App/Controller/Admin.pm:999 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:807 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:832 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:905 +#: perllib/FixMyStreet/App/Controller/Admin.pm:575 +#: perllib/FixMyStreet/App/Controller/Admin.pm:915 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:135 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:477 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:805 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:830 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:903 msgid "Updated!" msgstr "已更新！" @@ -4785,12 +4846,12 @@ msgstr "由{{title}}更新" msgid "Updates to this problem, %s" msgstr "更新問題, %s" -#: templates/web/base/admin/user_import.html:64 +#: templates/web/base/admin/users/import.html:64 msgid "Usage notes" msgstr "" -#: templates/web/base/admin/contact-form.html:43 -#: templates/web/base/admin/contact-form.html:44 +#: templates/web/base/admin/bodies/contact-form.html:43 +#: templates/web/base/admin/bodies/contact-form.html:44 msgid "" "Use confirmed to indicate that this contact has been\n" "confirmed as correct. If you are not sure of the origin or validity of the\n" @@ -4800,15 +4861,15 @@ msgid "" "as well." msgstr "" -#: templates/web/base/admin/open311-form-fields.html:137 +#: templates/web/base/admin/bodies/open311-form-fields.html:137 msgid "Use Open311 problem fetching" msgstr "" -#: templates/web/base/admin/open311-form-fields.html:76 +#: templates/web/base/admin/bodies/open311-form-fields.html:76 msgid "Use Open311 update-sending extension" msgstr "" -#: templates/web/base/admin/contact-form.html:143 +#: templates/web/base/admin/bodies/contact-form.html:143 msgid "Use this field to record details that are only displayed in the admin. Input is not shown publicly, and is not sent to the body." msgstr "" @@ -4817,48 +4878,48 @@ msgstr "" msgid "Used map" msgstr "已用過之地圖" -#: templates/web/base/admin/open311-form-fields.html:90 +#: templates/web/base/admin/bodies/open311-form-fields.html:90 msgid "User ID to attribute fetched comments to" msgstr "" -#: templates/web/base/admin/user_import.html:1 +#: templates/web/base/admin/users/import.html:1 msgid "User Import" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1944 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1954 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:568 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:578 msgid "User added to abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1476 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1589 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:113 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:226 msgid "User already exists" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1941 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1951 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:565 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:575 msgid "User already in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2116 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:657 msgid "User flag removed" msgstr "移除用戶的標記警告" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2087 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:628 msgid "User flagged" msgstr "給用戶標記警告" #: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/user-form.html:34 -#: templates/web/base/admin/users.html:32 +#: templates/web/base/admin/users/form.html:34 +#: templates/web/base/admin/users/index.html:32 msgid "User in abuse table" msgstr "" -#: templates/web/base/admin/users.html:5 +#: templates/web/base/admin/users/index.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "用戶找到相符的名稱與電子郵件" -#: templates/web/base/admin/user-alerts.html:2 +#: templates/web/base/admin/users/alerts.html:2 msgid "User's alerts" msgstr "" @@ -4867,20 +4928,20 @@ msgstr "" msgid "User:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:675 -#: perllib/FixMyStreet/Cobrand/Default.pm:737 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:417 +#: perllib/FixMyStreet/Cobrand/Default.pm:667 +#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:415 #: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:54 msgid "Users" msgstr "使用者" -#: templates/web/base/admin/user-form.html:165 +#: templates/web/base/admin/users/form.html:167 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:374 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:437 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:291 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:327 +#: perllib/FixMyStreet/App/Controller/Admin/Bodies.pm:354 msgid "Values updated" msgstr "數值更新" @@ -4914,12 +4975,12 @@ msgstr "檢視里/區之申報　" msgid "View wards" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "View/Mark private reports" msgstr "" #: templates/web/base/around/display_location.html:0 -#: templates/web/base/around/display_location.html:37 +#: templates/web/base/around/display_location.html:38 msgid "Viewing a location" msgstr "檢視地區" @@ -4954,7 +5015,7 @@ msgstr "" msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:209 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "我們理解此問題可能是%s之責任，然而目前我們並無他們的聯絡資訊。如果您知道適當的聯絡人資訊，請告訴我們。" @@ -4969,8 +5030,8 @@ msgstr "" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 -msgid "We will only use your personal information in accordance with our privacy policy." -msgstr "您的個人資料，將會依照本站隱私權政策作處理使用" +msgid "We will only use your personal information in accordance with our privacy policy." +msgstr "" #: templates/web/base/questionnaire/completed-open.html:2 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" @@ -4984,8 +5045,12 @@ msgstr "" msgid "We’ll get back to you as soon as we can." msgstr "我們會儘快回覆您" -#: templates/web/base/admin/category_edit.html:27 -#: templates/web/zurich/admin/body.html:18 +#: templates/web/base/report/new/duplicate_suggestions.html:12 +msgid "We’ve already reported these nearby problems to the council. Is one of them yours?" +msgstr "" + +#: templates/web/base/admin/bodies/category.html:28 +#: templates/web/zurich/admin/bodies/body.html:18 msgid "When edited" msgstr "何時編輯　" @@ -5005,14 +5070,10 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:120 +#: templates/web/base/report/_inspect.html:123 msgid "Which report is it a duplicate of?" msgstr "" -#: templates/web/base/js/translation_strings.html:68 -msgid "Whoa there Testino! Three photos are enough." -msgstr "" - #: templates/web/base/tokens/confirm_alert.html:7 msgid "Why stop there? Set up more alerts for free." msgstr "為何在此卡住？免費設定更多訊息通知 " @@ -5033,15 +5094,19 @@ msgstr "您願為FixMyStreet貢獻嗎?這個一個開放原始碼，可從 view the problem on this site." msgstr "您可在本站上檢視問題." -#: templates/web/base/admin/user-form.html:114 +#: templates/web/base/admin/users/form.html:116 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "您可以新增某位用戶到濫用者名單，它會自動隱藏(不會送出)該名用戶所提交的申報　" @@ -5092,7 +5156,7 @@ msgstr "您可以新增某位用戶到濫用者名單，它會自動隱藏(不 msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." msgstr "" -#: templates/web/base/contact/index.html:125 +#: templates/web/base/contact/index.html:127 msgid "You can contact technical support on %s" msgstr "您可寫信給%s詢求技術支援。" @@ -5113,15 +5177,15 @@ msgstr "" msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at %s." msgstr "您可協助我們找出當地問題的承辦人員 %s電子郵件，把此資訊提供給我們%s." -#: templates/web/base/admin/body-form.html:92 +#: templates/web/base/admin/bodies/form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "您可以刪除某一單位如果不想讓它在本站激活" -#: templates/web/base/js/translation_strings.html:46 +#: templates/web/base/js/translation_strings.html:52 msgid "You declined; please fill in the box above" msgstr "您受到拒絕，請填寫上方表格。" -#: templates/web/base/js/translation_strings.html:96 +#: templates/web/base/js/translation_strings.html:102 msgid "You have %s saved to submit." msgstr "" @@ -5187,7 +5251,7 @@ msgstr "" msgid "You need to add some bodies (such as councils or departments) before any reports can be sent." msgstr "您需要 加入相關單位 (例如地方政府或部門) ，在申報送出之前。" -#: templates/web/base/admin/bodies.html:11 +#: templates/web/base/admin/bodies/index.html:11 msgid "" "You need to add bodies (such as councils or departments) so that you can then add\n" " the categories of problems they can handle (such as potholes or streetlights) and the\n" @@ -5212,9 +5276,10 @@ msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/auth/create.html:37 #: templates/web/base/auth/general.html:49 -#: templates/web/base/contact/index.html:85 -#: templates/web/base/report/display_tools.html:46 +#: templates/web/base/contact/index.html:87 +#: templates/web/base/report/display_tools.html:49 #: templates/web/base/report/form/user_loggedout_email.html:7 +#: templates/web/base/report/new/duplicate_suggestions.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "您的電子郵件" @@ -5230,10 +5295,10 @@ msgid "Your email or mobile" msgstr "" #: templates/web/base/report/updates-sidebar-notes.html:3 -msgid "Your information will only be used in accordance with our privacy policy" -msgstr "您的個人資料，將會依照本站隱私權政策作處理使用" +msgid "Your information will only be used in accordance with our privacy policy" +msgstr "" -#: templates/web/base/contact/index.html:79 +#: templates/web/base/contact/index.html:81 msgid "Your name" msgstr "姓名" @@ -5249,7 +5314,7 @@ msgstr "" msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:86 +#: templates/web/base/js/translation_strings.html:92 msgid "Your offline reports" msgstr "" @@ -5272,7 +5337,7 @@ msgid "Your password should include %d or more characters." msgstr "" #: templates/web/base/auth/change_phone.html:19 -#: templates/web/base/contact/index.html:92 +#: templates/web/base/contact/index.html:94 msgid "Your phone number" msgstr "電話號碼" @@ -5297,7 +5362,7 @@ msgstr "" msgid "Your update" msgstr "" -#: templates/web/base/js/translation_strings.html:87 +#: templates/web/base/js/translation_strings.html:93 msgid "Your update has been saved offline for submission when back online." msgstr "" @@ -5314,25 +5379,24 @@ msgstr "" msgid "Yourself" msgstr "" -#: templates/web/base/admin/user_import.html:72 +#: templates/web/base/admin/users/import.html:72 msgid "a colon-separated list of permissions to grant that user, e.g. contribute_as_body:moderate:user_edit." msgstr "" -#: templates/web/base/report/_inspect.html:20 +#: templates/web/base/report/_inspect.html:23 msgid "admin" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:175 +#: templates/web/base/admin/users/form.html:177 msgid "all" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:975 -#: perllib/FixMyStreet/App/Controller/Moderate.pm:119 #: perllib/FixMyStreet/DB/Result/Comment.pm:226 -#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:145 -#: templates/web/base/admin/report_edit.html:194 +#: perllib/FixMyStreet/DB/Result/User.pm:297 +#: perllib/FixMyStreet/Script/ArchiveOldEnquiries.pm:160 #: templates/web/base/admin/update_edit.html:92 +#: templates/web/base/report/update/moderation_meta.html:2 msgid "an administrator" msgstr "" @@ -5366,8 +5430,8 @@ msgstr "" msgid "e.g. ‘This pothole has been here for two months and…’" msgstr "" +#: templates/web/base/admin/bodies/open311-form-fields.html:93 #: templates/web/base/admin/flagged.html:51 -#: templates/web/base/admin/open311-form-fields.html:93 msgid "edit user" msgstr "用戶編輯" @@ -5376,12 +5440,12 @@ msgstr "用戶編輯" msgid "from %s different users" msgstr "從不同的用戶%s " -#: templates/web/base/report/_item.html:67 +#: templates/web/base/report/_item_small.html:22 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" msgstr "%s上回更新:" -#: perllib/Utils.pm:227 +#: perllib/Utils.pm:226 msgid "less than a minute" msgstr "少於一分鐘" @@ -5392,7 +5456,7 @@ msgid "n/a" msgstr "不適用" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:176 +#: templates/web/base/admin/users/form.html:178 msgid "none" msgstr "" @@ -5432,7 +5496,7 @@ msgstr "原始輸入者" msgid "other areas:" msgstr "其它地區:" -#: templates/web/zurich/admin/contact-form.html:24 +#: templates/web/zurich/admin/bodies/contact-form.html:24 msgid "show" msgstr "" @@ -5440,7 +5504,7 @@ msgstr "" msgid "sign out" msgstr "登出" -#: templates/web/base/admin/user_import.html:71 +#: templates/web/base/admin/users/import.html:71 msgid "the database id of the body to associate that user with, e.g. 2217 for Buckinghamshire." msgstr "" @@ -5457,19 +5521,19 @@ msgstr "地圖上無標記，用戶未使用地圖" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:183 +#: perllib/FixMyStreet/Script/Reports.pm:193 msgid "this type of local problem" msgstr "此類在地問題" -#: perllib/Utils.pm:177 +#: perllib/Utils.pm:176 msgid "today" msgstr "今天" -#: templates/web/base/js/translation_strings.html:97 +#: templates/web/base/js/translation_strings.html:103 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:98 +#: templates/web/base/js/translation_strings.html:104 msgid "updates" msgstr "" @@ -5485,11 +5549,11 @@ msgstr "用戶來同一問題的地方政府- %d" msgid "user is problem owner" msgstr "%d 天數" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2060 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:601 msgid "user not in abuse list" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:2058 +#: perllib/FixMyStreet/App/Controller/Admin/Users.pm:599 msgid "user removed from abuse list" msgstr "" @@ -5498,31 +5562,31 @@ msgstr "" msgid "ward" msgstr "路檔" -#: templates/web/base/admin/bodies.html:56 +#: templates/web/base/admin/bodies/index.html:56 #, perl-format msgid "%d address" msgid_plural "%d addresses" msgstr[0] "" -#: perllib/Utils.pm:250 +#: perllib/Utils.pm:249 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d 日期" -#: perllib/Utils.pm:252 +#: perllib/Utils.pm:251 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d 時數" -#: perllib/Utils.pm:254 +#: perllib/Utils.pm:253 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d 分鐘數" -#: perllib/Utils.pm:246 +#: perllib/Utils.pm:245 #, perl-format msgid "%d month" msgid_plural "%d months" @@ -5534,13 +5598,13 @@ msgid "%d supporter" msgid_plural "%d supporters" msgstr[0] "%d 支援者" -#: perllib/Utils.pm:248 +#: perllib/Utils.pm:247 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d 週數" -#: perllib/Utils.pm:244 +#: perllib/Utils.pm:243 #, perl-format msgid "%d year" msgid_plural "%d years" @@ -5600,7 +5664,7 @@ msgid "%s update on reports" msgid_plural "%s updates on reports" msgstr[0] "%s 更新申報" -#: templates/web/base/report/_item.html:55 +#: templates/web/base/report/_item_small.html:10 #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" @@ -5618,7 +5682,7 @@ msgid "We do not yet have details for the council that covers this location." msgid_plural "We do not yet have details for the councils that cover this location." msgstr[0] "我們尚未有該區域負責單位之細節　" -#: templates/web/base/report/_item.html:65 +#: templates/web/base/report/_item_small.html:20 #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" diff --git a/script/update b/script/update index aa97935d3c2..6fa0e500497 100755 --- a/script/update +++ b/script/update @@ -6,4 +6,4 @@ cd "$(dirname "$0")/.." script/bootstrap bin/update-schema --commit bin/make_css -commonlib/bin/gettext-makemo +commonlib/bin/gettext-makemo 2>&1 diff --git a/templates/web/zurich/report/new/notes.html b/templates/web/zurich/report/new/notes.html index 3f832c1ed4a..90edbdac27d 100644 --- a/templates/web/zurich/report/new/notes.html +++ b/templates/web/zurich/report/new/notes.html @@ -1,6 +1,6 @@

[% loc("Please note:") %]

    -
  • [% loc("We will only use your personal information in accordance with our privacy policy.") %]
    • +
  • [% tprintf( loc("We will only use your personal information in accordance with our privacy policy."), c.cobrand.privacy_policy_url ) %]
  • [% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]