diff --git a/.tx/config b/.tx/config index f3e1f0d23a8..90961b05c11 100644 --- a/.tx/config +++ b/.tx/config @@ -2,7 +2,7 @@ host = https://www.transifex.com type = PO -[fixmystreet.v2-2] +[fixmystreet.v2-3] 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 6552cd74343..691dcb5ed9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,35 +1,37 @@ ## Releases * Unreleased + +* v2.3 (18th December 2017) - New features: - Optional verification of reports and updates, and logging in, - using confirmation by phone text. + using confirmation by phone text. #1856 #1872 - Improved email/phone management in your profile. - - Area summary statistics page in admin #1834 - - Allow multiple wards to be shown on reports page - - Don't cover whole map with pin loading indicator. - - Add Expand map toggle to more mobile maps. - - Add functionality to have per-body /reports page. - - Cobrands can disable sending of moderation emails. #1910 + - Don't cover whole map with pin loading indicator. #1874 + - Add Expand map toggle to more mobile maps. #1875 + - Allow multiple wards to be shown on reports page. #1870 + - Add functionality to have per-body /reports page. #1880 - Open311 category group support. #1923 - Front end improvements: + - Paginate reports on `/around`. #1805 #1577 #525 + - Improve performance of various pages, especially front. #1901 #1903 + - More prominent "Hide pins" link on map pages, to aid reporting in busy areas. #525 + - Optimised sprite file down from 97 KB to 36 KB. #1852 - SVG assets for core elements like button icons and map controls #1888 - Remove unneeded 2x PNG fallback images. - - Individual cobrands can disable social login #1890 - - Improve performance of various pages, especially front. #1903 - - Don't show geolocation link on non-HTTPS pages. - - More prominent "Hide pins" link on map pages, to aid reporting in busy areas. #525 - Improve location disambiguation page on small screens. #1918 + - Don't show geolocation link on non-HTTPS pages. #1915 + - Public report page shows state changes made in admin interface #1846 - Bugfixes - Shortlist menu item always remains a link #1855 - Fix encoded entities in RSS output. #1859 - Only save category changes if staff user update valid #1857 - Only create one update when staff user updating category #1857 - Do not include blank updates in email alerts #1857 - - Redirect inspectors correctly on creation in two-tier. + - Redirect inspectors correctly on creation in two-tier. #1877 - Report status filter All option works for body users #1845 - Always allow reports to be removed from shortlist #1882 - - Remove shortlist form from inspect duplicate list. + - Remove shortlist form from inspect duplicate list. #1889 - Fix pin size when JavaScript unavailable. - Fix display of text only body contacts #1895 - Prevent text overflow bug on homepage stats #1722 @@ -42,27 +44,29 @@ - Admin improvements: - Character length limit can be placed on report detailed information #1848 - Inspector panel shows nearest address if available #1850 - - Return a 200 rather than 404 for ref ID lookup. - - Public report page shows state changes made in admin interface #1846 + - Return a 200 rather than 404 for ref ID lookup. #1867 - Remove hidden from default staff state dropdown. #1878 - - Marking an item as a duplicate enforces providing duplicate id or - a public update #1873 + - Marking an item as a duplicate enforces providing ID/update. #1873 - Report field pre-filling for inspectors configurable #1854 - Admins can now unban users #1881 - - Council dashboard has date range for report generation #1885 - - More JavaScript-enhanced `` elements. #1589 #1892 - 'Auto-response' flag on response templates is honoured for fetched Open311 updates. #1924 + - Individual cobrands can disable social login #1890 + - Cobrands can disable sending of moderation emails. #1910 - Store all successful send methods. #1933 + - Dashboard/statistics: + - Improve/consolidate various admin summary statistics pages, + all now under /dashboard. #1834 #1919 + - Add date range for report generation #1885 + - CSV export now has token based authentication. #1911 + - And uses machine-readable dates. #1929 - Development improvements: - Add hook for pre-wrapper content. - Include JSON representation of extra fields in category_extras output - UK: - Use SVG logo, inlined on front page. #1887 - - Inline critical CSS on front page. + - Inline critical CSS on front page. #1893 * v2.2 (13th September 2017) - New features: @@ -77,10 +81,8 @@ - Always show pagination figures even if only one page. #1787 - Report pages list more updates to a report. #1806 - Clearer wording and more prominent email input on alert page. #1829 - - Paginate reports on `/around`. #1805 #1577 #525 - Cobrands can implement `hide_areas_on_reports` to hide outline on map. - Templates to allow extra messages through problem confirmation. #1837 - - Optimised sprite file down from 97 KB to 36 KB. #1852 - Admin improvements: - Highlight current shortlisted user in list tooltip. #1788 - Extra fields on contacts can be edited. #1743 diff --git a/README.md b/README.md index 662a09e0947..15a3bdc967f 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.2; see CHANGELOG.md for a version history. +Platform is now at version 2.3; see CHANGELOG.md for a version history. ## Installation diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index 5c8f38b8087..cb8b630e3eb 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.2} +VERSION=${VERSION_OVERRIDE:-v2.3} PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 83483a1c358..e18d2f932ae 100644 --- a/locale/FixMyStreet.po +++ b/locale/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "" @@ -25,6 +25,10 @@ msgstr "" msgid " or " msgstr "" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "" @@ -55,7 +59,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -63,7 +67,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -74,6 +78,10 @@ msgstr "" msgid "%s live updates" msgstr "" +#: templates/web/base/dashboard/index.html:159 templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" @@ -82,7 +90,7 @@ msgstr "" msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -90,10 +98,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "" - #: templates/web/zurich/admin/report_edit-sdm.html:62 templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" msgstr "" @@ -126,7 +130,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -147,7 +151,7 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 perllib/FixMyStreet/App/Controller/Report/New.pm:674 perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 perllib/FixMyStreet/App/Controller/Report/New.pm:688 perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "" @@ -159,14 +163,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 templates/web/base/admin/body-form.html:51 msgid "" "MAPIT_URL is set (%s) but no MAPIT_TYPES.
\n" @@ -174,16 +170,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -191,30 +187,46 @@ msgstr "" msgid "%s live problems" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my report by email/text" +msgstr "" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:106 templates/web/zurich/auth/general.html:51 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my update by email/text" +msgstr "" + +#: templates/web/base/auth/general.html:110 templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +msgid "No let me sign in by email or text" +msgstr "" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 templates/web/base/report/new/form_user_loggedout_password.html:3 templates/web/base/report/update/form_user_loggedout_password.html:2 +#: templates/web/base/auth/general.html:79 templates/web/base/report/new/form_user_loggedout_password.html:3 templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 templates/web/base/admin/body-form.html:4 msgid "" "Add a body for each administrative body, such as a council or department\n" @@ -226,10 +238,14 @@ msgstr "" msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:78 templates/web/base/admin/body-form.html:140 templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/bodies.html:78 templates/web/base/admin/body-form.html:139 templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" +#: templates/web/base/auth/change_email.html:1 templates/web/base/auth/change_email.html:7 +msgid "Add email address" +msgstr "" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -250,7 +266,11 @@ msgstr "" msgid "Add option" msgstr "" -#: templates/web/base/report/_item.html:10 templates/web/base/report/_item.html:16 templates/web/base/report/_main.html:140 templates/web/base/report/_main.html:19 templates/web/base/report/_main.html:30 +#: templates/web/base/auth/change_phone.html:1 templates/web/base/auth/change_phone.html:7 +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:132 templates/web/base/report/_main.html:15 templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -258,23 +278,23 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -298,7 +318,7 @@ msgstr "" msgid "Alert me to future updates" msgstr "" -#: templates/web/base/dashboard/index.html:138 templates/web/base/dashboard/index.html:21 templates/web/base/dashboard/index.html:30 templates/web/base/reports/_list-filters.html:3 +#: 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:63 templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -306,11 +326,11 @@ msgstr "" msgid "All Reports" msgstr "" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" -#: templates/web/base/admin/category-multiselect.html:5 templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/category-multiselect.html:5 templates/web/base/admin/responsepriorities/list.html:20 templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -322,15 +342,15 @@ msgstr "" msgid "All languages" msgstr "" -#: templates/web/base/main_nav_items.html:0 templates/web/base/main_nav_items.html:27 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 templates/web/zurich/nav_over_content.html:6 +#: templates/web/base/main_nav_items.html:0 templates/web/base/main_nav_items.html:27 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats/index.html:13 templates/web/zurich/footer.html:20 templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "" -#: templates/web/base/admin/stats.html:5 templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -362,7 +382,7 @@ msgstr "" msgid "Are you sure you want to cancel this upload?" msgstr "" -#: templates/web/base/admin/report_edit.html:84 templates/web/base/js/translation_strings.html:69 templates/web/base/report/display_tools.html:6 +#: templates/web/base/admin/report_edit.html:84 templates/web/base/admin/template_edit.html:75 templates/web/base/js/translation_strings.html:73 templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -370,7 +390,7 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -382,7 +402,7 @@ msgstr "" msgid "Assign to competent body:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:169 templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/report_edit.html:169 templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "" @@ -394,7 +414,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -410,11 +430,15 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:78 templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +msgid "Auto Response" +msgstr "" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -422,18 +446,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -446,15 +462,15 @@ msgstr "" msgid "Back" msgstr "" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" +msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/Default.pm:734 perllib/FixMyStreet/Cobrand/Zurich.pm:396 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:55 templates/web/zurich/header.html:56 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 perllib/FixMyStreet/Cobrand/Default.pm:717 perllib/FixMyStreet/Cobrand/Zurich.pm:396 templates/web/base/admin/bodies.html:1 templates/web/base/admin/report_edit.html:55 templates/web/zurich/header.html:50 msgid "Bodies" msgstr "" @@ -462,14 +478,10 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -482,7 +494,7 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 templates/web/base/admin/responsepriorities/list.html:8 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 templates/web/base/admin/responsepriorities/list.html:8 templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -490,38 +502,46 @@ 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/report/_inspect.html:48 templates/web/base/report/_item.html:92 templates/web/base/report/new/category.html:6 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.html:50 +#: 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:99 templates/web/base/report/_inspect.html:54 templates/web/base/report/_item.html:92 templates/web/base/report/new/category.html:12 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:50 msgid "Category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +msgid "Category and State" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/report_edit.html:119 templates/web/base/dashboard/index.html:29 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/contact-form.html:2 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100 +#: templates/web/base/admin/report_edit.html:119 templates/web/base/dashboard/index.html:39 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/contact-form.html:2 templates/web/zurich/admin/report_edit-sdm.html:72 templates/web/zurich/admin/report_edit.html:100 msgid "Category:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" -#: templates/web/base/auth/change_email.html:1 templates/web/base/auth/change_email.html:3 templates/web/base/auth/change_email.html:30 +#: templates/web/base/auth/change_email.html:1 templates/web/base/auth/change_email.html:3 msgid "Change email address" msgstr "" -#: templates/web/base/auth/change_password.html:1 templates/web/base/auth/change_password.html:16 templates/web/base/auth/change_password.html:4 templates/web/base/auth/change_password.html:43 templates/web/base/my/my.html:23 +#: templates/web/base/auth/change_password.html:1 templates/web/base/auth/change_password.html:16 templates/web/base/auth/change_password.html:4 templates/web/base/auth/change_password.html:43 templates/web/base/my/my.html:63 msgid "Change password" msgstr "" +#: templates/web/base/auth/change_phone.html:1 templates/web/base/auth/change_phone.html:3 +msgid "Change phone number" +msgstr "" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -543,18 +563,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "" @@ -579,11 +595,11 @@ msgstr "" msgid "Click the link in that email to sign in." msgstr "" -#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 perllib/FixMyStreet/Cobrand/Zurich.pm:194 perllib/FixMyStreet/Cobrand/Zurich.pm:965 perllib/FixMyStreet/DB/ResultSet/State.pm:11 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/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:16 templates/web/zurich/admin/stats.html:31 +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 perllib/FixMyStreet/Cobrand/Zurich.pm:194 perllib/FixMyStreet/Cobrand/Zurich.pm:965 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:112 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:16 templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "" @@ -595,15 +611,15 @@ msgstr "" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:92 templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/report_edit.html:92 templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:91 templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/report_edit.html:91 templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" -#: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/admin/extra-metadata-form.html:14 templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -611,7 +627,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 templates/web/base/admin/config_page.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -619,7 +635,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "" @@ -631,14 +647,10 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/contact-form.html:56 templates/web/zurich/admin/contact-form.html:12 templates/web/zurich/admin/stats.html:40 +#: templates/web/base/admin/contact-form.html:56 templates/web/zurich/admin/contact-form.html:12 templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "" - #: templates/web/base/admin/list_updates.html:39 templates/web/base/admin/problem_row.html:36 templates/web/base/admin/report_edit.html:78 msgid "Confirmed:" msgstr "" @@ -660,7 +672,7 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1801 perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "" @@ -676,35 +688,15 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "" -#: templates/web/base/admin/stats.html:12 templates/web/base/admin/stats.html:32 templates/web/zurich/admin/stats.html:45 templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "" @@ -724,32 +716,36 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 templates/web/zurich/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:71 templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" -#: templates/web/base/admin/problem_row.html:34 templates/web/base/admin/templates.html:12 +#: templates/web/base/admin/problem_row.html:34 templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "" -#: templates/web/base/admin/list_updates.html:38 templates/web/base/admin/report_edit.html:77 templates/web/base/admin/update_edit.html:53 templates/web/zurich/admin/update_edit.html:29 +#: templates/web/base/admin/list_updates.html:38 templates/web/base/admin/report_edit.html:77 templates/web/base/admin/update_edit.html:55 templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +msgid "Current token:" +msgstr "" + +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" msgstr "" #: templates/web/base/admin/bodies.html:9 templates/web/base/admin/index.html:17 @@ -760,11 +756,11 @@ msgstr "" msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 templates/web/base/dashboard/index.html:7 templates/web/base/reports/index.html:15 templates/web/base/reports/index.html:18 +#: templates/web/base/dashboard/index.html:7 templates/web/base/dashboard/index.html:9 templates/web/base/reports/index.html:15 templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -776,11 +772,11 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 templates/web/base/admin/template_edit.html:50 templates/web/zurich/admin/template_edit.html:33 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 templates/web/base/admin/template_edit.html:75 templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -788,7 +784,7 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/base/report/_main.html:114 templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -800,6 +796,10 @@ msgstr "" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" msgstr "" @@ -808,6 +808,10 @@ msgstr "" msgid "Details:" msgstr "" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "" @@ -820,7 +824,7 @@ msgstr "" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:118 templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -829,11 +833,11 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 templates/web/base/report/new/form_user_loggedout.html:25 templates/web/base/report/new/oauth_email_form.html:18 templates/web/base/report/update-form.html:30 templates/web/base/report/update/form_user_loggedout.html:27 +#: templates/web/base/auth/general.html:57 templates/web/base/report/new/form_user_loggedout.html:25 templates/web/base/report/new/oauth_email_form.html:18 templates/web/base/report/update-form.html:30 templates/web/base/report/update/form_user_loggedout.html:27 msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -853,11 +857,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -873,7 +877,7 @@ msgstr "" msgid "Easting/Northing:" msgstr "" -#: templates/web/base/admin/list_updates.html:42 templates/web/base/admin/problem_row.html:41 templates/web/base/admin/responsepriorities/list.html:28 templates/web/base/admin/templates.html:22 templates/web/base/admin/users.html:34 templates/web/zurich/admin/problem_row.html:48 +#: templates/web/base/admin/list_updates.html:42 templates/web/base/admin/problem_row.html:41 templates/web/base/admin/responsepriorities/list.html:28 templates/web/base/admin/templates.html:28 templates/web/base/admin/users.html:34 templates/web/zurich/admin/problem_row.html:48 templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "" @@ -881,27 +885,27 @@ msgstr "" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" -#: templates/web/base/admin/report_edit.html:0 templates/web/base/admin/report_edit.html:14 templates/web/base/admin/report_edit.html:4 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit-sdm.html:5 templates/web/zurich/admin/report_edit.html:1 templates/web/zurich/admin/report_edit.html:5 +#: templates/web/base/admin/report_edit.html:0 templates/web/base/admin/report_edit.html:14 templates/web/base/admin/report_edit.html:5 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit-sdm.html:6 templates/web/zurich/admin/report_edit.html:1 templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "" @@ -917,16 +921,16 @@ msgstr "" 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/users.html:17 templates/web/base/auth/general.html:51 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:24 templates/web/zurich/auth/general.html:54 +#: 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/users.html:17 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:24 templates/web/zurich/auth/general.html:54 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" +#: 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:38 templates/web/base/report/update/form_name.html:23 +msgid "Email address" msgstr "" -#: templates/web/base/admin/contact-form.html:38 templates/web/base/alert/_list.html:74 templates/web/base/report/new/form_user_loggedin.html:32 templates/web/base/report/update/form_name.html:23 -msgid "Email address" +#: templates/web/base/report/new/form_user_loggedin.html:71 templates/web/base/report/new/form_user_loggedout_by_email.html:34 +msgid "Email address (optional)" msgstr "" #: templates/web/base/tokens/confirm_alert.html:6 @@ -937,15 +941,15 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:129 templates/web/base/admin/update_edit.html:35 templates/web/base/admin/user-form.html:19 templates/web/zurich/admin/body.html:48 templates/web/zurich/admin/contact-form.html:6 +#: templates/web/base/admin/report_edit.html:138 templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 templates/web/zurich/admin/body.html:48 templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "" @@ -957,15 +961,15 @@ msgid "" " this article." msgstr "" -#: templates/web/base/admin/body-form.html:122 templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:121 templates/web/base/admin/body-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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +msgid "End Date" msgstr "" #: templates/web/base/admin/open311-form-fields.html:21 @@ -984,11 +988,11 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "" -#: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 templates/web/base/around/postcode_form.html:5 templates/web/base/around/postcode_form.html:6 +#: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 templates/web/base/around/postcode_form.html:7 templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "" -#: templates/web/base/auth/general.html:118 templates/web/base/report/new/form_user_loggedout_by_email.html:35 templates/web/base/report/update/form_user_loggedout_by_email.html:13 templates/web/zurich/auth/general.html:65 +#: templates/web/base/auth/general.html:123 templates/web/base/report/new/form_user_loggedout_by_email.html:45 templates/web/base/report/update/form_user_loggedout_by_email.html:17 templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" @@ -1000,7 +1004,7 @@ msgstr "" msgid "Error" msgstr "" -#: templates/web/base/reports/_list-filters.html:31 templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:39 templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1024,7 +1028,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1036,7 +1040,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1048,7 +1052,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 templates/web/base/admin/reportextrafields/edit.html:1 templates/web/base/admin/reportextrafields/index.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 templates/web/base/admin/reportextrafields/edit.html:1 templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" msgstr "" @@ -1056,7 +1060,7 @@ msgstr "" msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:144 templates/web/base/report/_item.html:108 +#: templates/web/base/report/_inspect.html:150 templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1080,19 +1084,19 @@ msgstr "" msgid "Fix this by choosing an area covered in the Edit body details form below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 templates/web/base/admin/states/index.html:29 templates/web/base/admin/stats_fix_rate.html:4 +#: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 templates/web/base/admin/states/index.html:29 templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:97 templates/web/base/admin/responsepriorities/edit.html:53 templates/web/zurich/admin/body-form.html:36 +#: templates/web/base/admin/body-form.html:96 templates/web/base/admin/responsepriorities/edit.html:53 templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "" @@ -1100,7 +1104,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 templates/web/base/admin/users.html:20 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "" @@ -1108,7 +1112,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1116,7 +1120,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:135 templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "" @@ -1136,7 +1140,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 templates/web/base/report/new/form_user_loggedout_password.html:20 templates/web/base/report/update/form_user_loggedout_password.html:19 +#: templates/web/base/auth/general.html:94 templates/web/base/report/new/form_user_loggedout_password.html:20 templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" msgstr "" @@ -1152,8 +1156,8 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 templates/web/base/auth/generate_token.html:2 templates/web/base/auth/generate_token.html:20 templates/web/base/auth/generate_token.html:33 templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 templates/web/base/report/display_tools.html:14 @@ -1180,7 +1184,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:34 templates/web/base/around/postcode_form.html:13 templates/web/base/reports/_list-filters.html:49 templates/web/base/reports/_list-filters.html:64 templates/web/base/reports/index.html:75 templates/web/zurich/admin/stats.html:26 +#: 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:35 templates/web/base/around/postcode_form.html:15 templates/web/base/reports/_list-filters.html:57 templates/web/base/reports/_list-filters.html:72 templates/web/base/reports/index.html:89 templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "" @@ -1188,7 +1192,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1196,6 +1200,14 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" +#: templates/web/base/dashboard/index.html:93 +msgid "Group by %s" +msgstr "" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "" @@ -1212,15 +1224,19 @@ msgstr "" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +msgid "Here are some other nearby reports:" +msgstr "" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:911 perllib/FixMyStreet/DB/ResultSet/State.pm:60 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:911 perllib/FixMyStreet/DB/ResultSet/State.pm:64 templates/web/base/admin/update_edit.html:30 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/stats/index.html:32 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1240,19 +1256,15 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "" - -#: templates/web/base/around/display_location.html:62 templates/web/base/js/translation_strings.html:55 +#: templates/web/base/around/display_location.html:60 templates/web/base/around/display_location.html:68 templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" -#: templates/web/base/report/_report_meta_info.html:3 templates/web/base/report/update.html:55 +#: templates/web/base/report/_report_meta_info.html:3 templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1264,7 +1276,7 @@ msgstr "" msgid "History" msgstr "" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "" @@ -1310,12 +1322,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1324,7 +1344,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1332,7 +1352,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1398,11 +1418,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1414,7 +1430,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1426,26 +1442,18 @@ msgstr "" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1462,7 +1470,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 templates/web/base/report/new/form_user_loggedout_password.html:16 templates/web/base/report/update/form_user_loggedout_password.html:15 templates/web/zurich/auth/general.html:40 +#: templates/web/base/auth/general.html:90 templates/web/base/report/new/form_user_loggedout_password.html:16 templates/web/base/report/update/form_user_loggedout_password.html:15 templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "" @@ -1482,11 +1490,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1510,18 +1514,14 @@ msgstr "" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1530,11 +1530,11 @@ msgstr "" msgid "List all reported problems" msgstr "" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "" -#: templates/web/base/alert/choose.html:1 templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 templates/web/base/tokens/confirm_alert.html:1 +#: templates/web/base/alert/choose.html:1 templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" msgstr "" @@ -1558,11 +1558,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1570,11 +1574,11 @@ msgstr "" msgid "MAP" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1586,11 +1590,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1610,62 +1614,66 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 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:65 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.html:16 templates/web/base/auth/general.html:108 templates/web/base/report/new/form_user_loggedin.html:42 templates/web/base/report/new/form_user_loggedout_by_email.html:7 templates/web/base/report/update/form_name.html:27 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:60 templates/web/zurich/report/new/fill_in_details_form.html:59 +#: templates/web/base/admin/bodies.html:25 templates/web/base/admin/body-form.html:24 templates/web/base/admin/extra-metadata-form.html:65 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.html:16 templates/web/base/auth/general.html:113 templates/web/base/report/new/form_user_loggedin.html:49 templates/web/base/report/new/form_user_loggedout_by_email.html:11 templates/web/base/report/update/form_name.html:27 templates/web/zurich/admin/body-form.html:4 templates/web/zurich/auth/general.html:60 templates/web/zurich/report/new/fill_in_details_form.html:59 msgid "Name" msgstr "" -#: templates/web/base/admin/report_edit.html:127 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/report_edit.html:127 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:41 msgid "Name:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" @@ -1674,11 +1682,11 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1692,19 +1700,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -1724,6 +1736,10 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +msgid "New phone number:" +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:4 templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" msgstr "" @@ -1752,15 +1768,15 @@ msgstr "" msgid "New reports" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/states/index.html:91 templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "" -#: templates/web/base/admin/template_edit.html:4 templates/web/base/admin/templates.html:28 templates/web/zurich/admin/template_edit.html:9 +#: templates/web/base/admin/template_edit.html:4 templates/web/base/admin/templates.html:34 templates/web/zurich/admin/template_edit.html:9 templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -1768,22 +1784,18 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:125 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:55 templates/web/base/report/_inspect.html:92 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:125 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:26 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:106 templates/web/base/questionnaire/index.html:55 templates/web/base/report/_inspect.html:98 msgid "No" msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "" @@ -1812,6 +1824,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "" @@ -1830,13 +1846,13 @@ msgstr "" msgid "None" msgstr "" -#: templates/web/base/admin/user-form.html:58 templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 templates/web/base/admin/user-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:28 templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -1852,7 +1868,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "" @@ -1864,10 +1880,6 @@ msgstr "" msgid "Note" msgstr "" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 templates/web/zurich/admin/contact-form.html:19 msgid "Note:" msgstr "" @@ -1892,31 +1904,39 @@ msgstr "" msgid "Now to submit your update…" msgstr "" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:174 perllib/FixMyStreet/Cobrand/Zurich.pm:905 perllib/FixMyStreet/DB/ResultSet/State.pm:10 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/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18 +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:174 perllib/FixMyStreet/Cobrand/Zurich.pm:905 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:111 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/update_edit.html:18 msgid "Open" msgstr "" @@ -1952,15 +1972,19 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 perllib/FixMyStreet/App/Controller/Report/New.pm:675 perllib/FixMyStreet/App/Controller/Report/New.pm:676 perllib/FixMyStreet/DB/Result/Problem.pm:579 perllib/FixMyStreet/DB/Result/Problem.pm:586 perllib/FixMyStreet/DB/Result/Problem.pm:601 perllib/FixMyStreet/DB/Result/Problem.pm:610 perllib/FixMyStreet/Script/Reports.pm:183 perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 perllib/FixMyStreet/App/Controller/Report/New.pm:689 perllib/FixMyStreet/App/Controller/Report/New.pm:690 perllib/FixMyStreet/App/Controller/Report/New.pm:719 perllib/FixMyStreet/App/Controller/Report/New.pm:722 perllib/FixMyStreet/DB/Result/Problem.pm:588 perllib/FixMyStreet/DB/Result/Problem.pm:595 perllib/FixMyStreet/DB/Result/Problem.pm:610 perllib/FixMyStreet/DB/Result/Problem.pm:619 perllib/FixMyStreet/Script/Reports.pm:182 perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +msgid "Other wards" +msgstr "" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -1976,15 +2000,15 @@ msgstr "" msgid "Parent" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:111 templates/web/base/report/new/form_user_loggedout_by_email.html:28 templates/web/base/report/update/form_user_loggedout_by_email.html:6 templates/web/zurich/auth/general.html:32 templates/web/zurich/auth/general.html:63 +#: templates/web/base/auth/general.html:116 templates/web/base/report/new/form_user_loggedout_by_email.html:38 templates/web/base/report/update/form_user_loggedout_by_email.html:10 templates/web/zurich/auth/general.html:32 templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "" @@ -1992,7 +2016,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2000,19 +2024,23 @@ msgstr "" msgid "Phone Reporter:" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:65 +#: templates/web/base/auth/change_phone.html:36 templates/web/base/report/new/form_user_loggedin.html:33 templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:59 templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:87 templates/web/base/admin/report_edit.html:134 templates/web/base/admin/user-form.html:21 templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "" -#: 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:30 templates/web/base/report/new/form_report.html:45 templates/web/base/report/new/form_report.html:47 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.html:37 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/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:30 templates/web/base/report/new/form_report.html:45 templates/web/base/report/new/form_report.html:47 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:37 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 "" @@ -2032,11 +2060,15 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/base/reports/index.html:63 templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 templates/web/base/js/translation_strings.html:30 +#: templates/web/base/reports/index.html:66 templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "" @@ -2052,15 +2084,19 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/change_email.html:15 templates/web/base/auth/change_email.html:18 templates/web/base/auth/general.html:39 templates/web/base/auth/general.html:45 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:9 +#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:9 templates/web/base/auth/change_email.html:24 templates/web/base/auth/change_email.html:27 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 perllib/FixMyStreet/App/Controller/Report/New.pm:873 perllib/FixMyStreet/App/Controller/Report/New.pm:896 perllib/FixMyStreet/DB/Result/Problem.pm:383 templates/web/base/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 perllib/FixMyStreet/DB/Result/User.pm:198 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:297 perllib/FixMyStreet/App/Controller/Report/New.pm:905 perllib/FixMyStreet/App/Controller/Report/New.pm:928 perllib/FixMyStreet/DB/Result/Problem.pm:383 templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2075,27 +2111,31 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 perllib/FixMyStreet/DB/Result/Comment.pm:128 templates/web/base/js/translation_strings.html:2 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 perllib/FixMyStreet/DB/Result/Comment.pm:128 templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 perllib/FixMyStreet/DB/Result/User.pm:200 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:1365 perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" -#: templates/web/base/auth/change_password.html:22 templates/web/base/auth/change_password.html:25 templates/web/base/js/translation_strings.html:19 +#: templates/web/base/auth/change_password.html:22 templates/web/base/auth/change_password.html:25 templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:115 perllib/FixMyStreet/DB/Result/Problem.pm:366 templates/web/base/js/translation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Contact.pm:115 perllib/FixMyStreet/DB/Result/Problem.pm:366 templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 perllib/FixMyStreet/App/Controller/Admin.pm:1466 perllib/FixMyStreet/App/Controller/Admin.pm:343 perllib/FixMyStreet/DB/Result/User.pm:164 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 perllib/FixMyStreet/App/Controller/Admin.pm:1452 perllib/FixMyStreet/App/Controller/Admin.pm:311 perllib/FixMyStreet/DB/Result/User.pm:193 templates/web/base/js/translation_strings.html:13 templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "" @@ -2103,39 +2143,43 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:369 templates/web/base/js/translation_strings.html:4 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 perllib/FixMyStreet/App/Controller/Admin.pm:1446 +msgid "Please enter a valid email or phone number" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:369 templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:114 perllib/FixMyStreet/DB/Result/User.pm:161 templates/web/base/auth/change_email.html:15 templates/web/base/auth/change_email.html:17 templates/web/base/auth/general.html:39 templates/web/base/auth/general.html:44 templates/web/base/js/translation_strings.html:11 templates/web/base/js/translation_strings.html:15 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 perllib/FixMyStreet/DB/Result/User.pm:191 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:12 templates/web/base/js/translation_strings.html:16 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 templates/web/zurich/report/new/fill_in_details_form.html:57 +#: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:326 templates/web/base/js/translation_strings.html:7 +#: perllib/FixMyStreet/Cobrand/UK.pm:326 templates/web/base/js/translation_strings.html:8 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:113 perllib/FixMyStreet/DB/Result/Comment.pm:125 perllib/FixMyStreet/DB/Result/Problem.pm:377 perllib/FixMyStreet/DB/Result/User.pm:157 templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 perllib/FixMyStreet/DB/Result/Comment.pm:125 perllib/FixMyStreet/DB/Result/Problem.pm:377 perllib/FixMyStreet/DB/Result/User.pm:186 templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:6 templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "" @@ -2179,7 +2223,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +msgid "Please provide a duplicate ID or public update for this report." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2215,6 +2263,10 @@ msgstr "" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "" @@ -2223,7 +2275,7 @@ msgstr "" msgid "Please write your update here" msgstr "" -#: templates/web/base/report/update-form.html:25 templates/web/base/report/update/form_user_loggedout_by_email.html:14 templates/web/base/report/update/form_user_loggedout_password.html:10 +#: templates/web/base/report/update-form.html:25 templates/web/base/report/update/form_user_loggedout_by_email.html:18 templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2231,15 +2283,15 @@ msgstr "" msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "" @@ -2251,11 +2303,11 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 templates/web/base/report/_item.html:100 +#: templates/web/base/report/_inspect.html:129 templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2267,7 +2319,7 @@ 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:137 +#: templates/web/base/admin/body.html:88 templates/web/base/admin/contact-form.html:75 templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "" @@ -2291,19 +2343,19 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/stats.html:57 templates/web/base/admin/stats_by_state.html:12 templates/web/zurich/admin/index.html:9 +#: templates/web/base/admin/stats/index.html:5 templates/web/base/admin/stats/state.html:12 templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 templates/web/base/admin/flagged.html:10 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -2327,7 +2379,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 perllib/FixMyStreet/Cobrand/UK.pm:269 msgid "Problems within %s" msgstr "" @@ -2348,7 +2400,7 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:2 templates/web/base/report/update-form.html:6 +#: templates/web/base/report/display.html:57 templates/web/base/report/duplicate-no-updates.html:3 templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" @@ -2356,11 +2408,11 @@ msgstr "" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2372,11 +2424,11 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" -#: templates/web/zurich/admin/report_edit.html:123 templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/report_edit.html:123 templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "" @@ -2420,7 +2472,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:222 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" msgstr "" @@ -2440,7 +2492,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2453,7 +2505,7 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2473,7 +2525,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:138 templates/web/base/report/_main.html:18 templates/web/base/report/_main.html:26 +#: templates/web/base/report/_item.html:12 templates/web/base/report/_item.html:9 templates/web/base/report/_main.html:130 templates/web/base/report/_main.html:14 templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2481,10 +2533,14 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 templates/web/base/admin/update_edit.html:69 templates/web/zurich/admin/update_edit.html:35 +#: templates/web/base/admin/report_edit.html:159 templates/web/base/admin/update_edit.html:71 templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -2509,11 +2565,11 @@ msgstr "" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -2525,15 +2581,15 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 templates/web/base/contact/index.html:55 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "" -#: templates/web/base/admin/questionnaire.html:5 templates/web/base/questionnaire/index.html:64 +#: templates/web/base/admin/stats/questionnaire.html:5 templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 templates/web/base/contact/index.html:57 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "" @@ -2545,27 +2601,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -2573,11 +2629,11 @@ msgstr "" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 templates/web/base/around/lookup_by_ref.html:2 templates/web/base/js/translation_strings.html:42 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:42 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 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 perllib/FixMyStreet/Cobrand/Zurich.pm:388 templates/web/base/dashboard/index.html:134 templates/web/zurich/header.html:52 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 perllib/FixMyStreet/Cobrand/Zurich.pm:388 templates/web/zurich/header.html:46 msgid "Reports" msgstr "" @@ -2593,7 +2649,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -2605,7 +2661,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -2657,19 +2713,19 @@ msgstr "" msgid "Response Templates" msgstr "" -#: templates/web/base/admin/templates.html:1 templates/web/base/admin/templates.html:4 templates/web/zurich/admin/template_edit.html:1 templates/web/zurich/admin/template_edit.html:4 +#: templates/web/base/admin/templates.html:1 templates/web/zurich/admin/template_edit.html:1 templates/web/zurich/admin/template_edit.html:4 templates/web/zurich/admin/templates.html:1 templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -2685,11 +2741,11 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 perllib/FixMyStreet/App/Controller/Admin.pm:1852 templates/web/base/admin/report_edit.html:151 templates/web/base/admin/update_edit.html:66 templates/web/zurich/admin/report_edit.html:118 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 perllib/FixMyStreet/App/Controller/Admin.pm:1879 templates/web/base/admin/report_edit.html:156 templates/web/base/admin/update_edit.html:68 templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 templates/web/base/admin/report_edit.html:152 templates/web/base/admin/update_edit.html:67 templates/web/zurich/admin/report_edit.html:119 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 templates/web/base/admin/report_edit.html:157 templates/web/base/admin/update_edit.html:69 templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -2697,15 +2753,15 @@ msgstr "" msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" -#: templates/web/base/js/translation_strings.html:47 templates/web/base/maps/google-ol.html:16 +#: templates/web/base/js/translation_strings.html:47 templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" -#: templates/web/base/admin/contact-form.html:138 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:58 templates/web/base/admin/template_edit.html:46 templates/web/base/report/_inspect.html:182 templates/web/base/report/_main.html:117 templates/web/base/report/update.html:69 templates/web/zurich/admin/body.html:62 templates/web/zurich/admin/contact-form.html:22 templates/web/zurich/admin/template_edit.html:29 +#: templates/web/base/admin/contact-form.html:138 templates/web/base/admin/reportextrafields/edit.html:64 templates/web/base/admin/responsepriorities/edit.html:58 templates/web/base/admin/template_edit.html:71 templates/web/base/report/_inspect.html:189 templates/web/base/report/_main.html:113 templates/web/base/report/update.html:72 templates/web/zurich/admin/body.html:62 templates/web/zurich/admin/contact-form.html:22 templates/web/zurich/admin/template_edit.html:29 msgid "Save changes" msgstr "" @@ -2713,12 +2769,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -2734,7 +2790,7 @@ msgstr "" msgid "Search Users" msgstr "" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "" @@ -2742,7 +2798,7 @@ msgstr "" msgid "Search:" msgstr "" -#: templates/web/base/admin/reports.html:27 +#: templates/web/base/admin/reports.html:27 templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -2754,7 +2810,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -2762,7 +2818,7 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "" @@ -2782,11 +2838,15 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "" @@ -2794,11 +2854,11 @@ msgstr "" msgid "Sent:" msgstr "" -#: templates/web/base/admin/report_edit.html:90 templates/web/zurich/admin/stats.html:45 +#: templates/web/base/admin/report_edit.html:90 templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -2806,7 +2866,7 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/main_nav_items.html:10 templates/web/base/report/_main.html:140 templates/web/base/report/_main.html:21 templates/web/base/report/_main.html:29 +#: templates/web/base/main_nav_items.html:10 templates/web/base/report/_main.html:132 templates/web/base/report/_main.html:17 templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -2814,15 +2874,15 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 templates/web/base/report/_main.html:20 templates/web/base/report/_main.html:25 templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 templates/web/base/report/_main.html:16 templates/web/base/report/_main.html:21 templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" -#: templates/web/base/report/_item.html:15 templates/web/base/report/_main.html:148 +#: templates/web/base/report/_item.html:15 templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -2830,35 +2890,31 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 templates/web/base/report/new/form_user_loggedout_by_email.html:22 templates/web/base/report/update/form_name.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:63 templates/web/base/report/new/form_user_loggedout_by_email.html:26 templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 templates/web/base/js/translation_strings.html:54 +#: templates/web/base/around/display_location.html:58 templates/web/base/around/display_location.html:66 templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:88 templates/web/base/main_nav_items.html:6 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 +#: templates/web/base/auth/general.html:124 templates/web/base/auth/general.html:3 templates/web/base/auth/general.html:85 templates/web/base/main_nav_items.html:6 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35 msgid "Sign in" msgstr "" @@ -2866,11 +2922,15 @@ msgstr "" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 templates/web/zurich/auth/sign_out.html:1 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -2884,7 +2944,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "" @@ -2897,15 +2957,19 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 perllib/FixMyStreet/Geocode/OSM.pm:48 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" @@ -2931,27 +2995,27 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +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:40 templates/web/base/report/_inspect.html:82 templates/web/base/report/_item.html:96 templates/web/base/report/update/form_update.html:39 templates/web/zurich/admin/contact-form.html:10 +#: 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:50 templates/web/base/admin/templates.html:8 templates/web/base/dashboard/index.html:100 templates/web/base/report/_inspect.html:88 templates/web/base/report/_item.html:96 templates/web/base/report/update/form_update.html:39 templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 templates/web/base/report/update.html:49 msgid "State changed to:" msgstr "" @@ -2959,11 +3023,11 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 templates/web/base/admin/states/index.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 perllib/FixMyStreet/Cobrand/Zurich.pm:391 templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 templates/web/base/admin/stats_by_state.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 perllib/FixMyStreet/Cobrand/Zurich.pm:391 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:59 msgid "Stats" msgstr "" @@ -2971,7 +3035,7 @@ msgstr "" msgid "Status" msgstr "" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "" @@ -2983,7 +3047,11 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +msgid "Subcategory" +msgstr "" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "" @@ -2999,11 +3067,11 @@ msgstr "" msgid "Subject:" msgstr "" -#: templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/form_user_loggedin.html:63 templates/web/base/report/new/form_user_loggedout_by_email.html:36 templates/web/base/report/new/form_user_loggedout_password.html:11 templates/web/zurich/report/new/fill_in_details_form.html:73 +#: templates/web/base/auth/smsform.html:27 templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/form_user_loggedin.html:76 templates/web/base/report/new/form_user_loggedout_by_email.html:46 templates/web/base/report/new/form_user_loggedout_password.html:11 templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:162 templates/web/base/admin/report_edit.html:24 templates/web/base/admin/update_edit.html:77 templates/web/base/admin/user-form.html:170 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:264 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/base/admin/report_edit.html:167 templates/web/base/admin/report_edit.html:24 templates/web/base/admin/update_edit.html:79 templates/web/base/admin/user-form.html:188 templates/web/zurich/admin/report_edit-sdm.html:124 templates/web/zurich/admin/report_edit.html:264 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -3031,23 +3099,27 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 perllib/FixMyStreet/Cobrand/Zurich.pm:387 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:49 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 perllib/FixMyStreet/Cobrand/Zurich.pm:387 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:43 msgid "Summary" msgstr "" -#: templates/web/zurich/reports/index.html:0 templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:0 templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 templates/web/base/dashboard/index.html:21 +msgid "Summary statistics" +msgstr "" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -3055,11 +3127,11 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 perllib/FixMyStreet/Cobrand/Zurich.pm:398 templates/web/zurich/header.html:69 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 perllib/FixMyStreet/Cobrand/Zurich.pm:398 templates/web/zurich/header.html:63 msgid "Templates" msgstr "" -#: templates/web/base/admin/list_updates.html:12 templates/web/base/admin/templates.html:11 +#: templates/web/base/admin/list_updates.html:12 templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -3067,7 +3139,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/base/admin/template_edit.html:17 templates/web/base/admin/update_edit.html:20 templates/web/zurich/admin/template_edit.html:24 templates/web/zurich/admin/update_edit.html:12 +#: templates/web/base/admin/template_edit.html:33 templates/web/base/admin/update_edit.html:20 templates/web/zurich/admin/template_edit.html:24 templates/web/zurich/admin/update_edit.html:12 msgid "Text:" msgstr "" @@ -3091,7 +3163,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" @@ -3107,7 +3179,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3115,11 +3187,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "" @@ -3149,7 +3221,7 @@ msgid "" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:102 templates/web/base/admin/body-form.html:103 templates/web/base/admin/contact-form.html:104 templates/web/base/admin/contact-form.html:105 +#: 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 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." @@ -3177,7 +3249,7 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "" @@ -3217,7 +3289,7 @@ msgstr "" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3241,7 +3313,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3251,27 +3323,31 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 templates/web/base/my/_problem-list.html:8 templates/web/base/reports/_problem-list.html:13 +#: templates/web/base/around/on_map_list_items.html:17 templates/web/base/my/_problem-list.html:8 templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 -msgid "There was a problem showing the All Reports page. Please try again later." +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:138 perllib/FixMyStreet/App/Controller/Dashboard.pm:62 -msgid "There was a problem showing this page. Please try again later." +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 +msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 perllib/FixMyStreet/App/Controller/Report/Update.pm:152 templates/web/base/auth/general.html:55 templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." +#: perllib/FixMyStreet/App/Controller/Contact.pm:138 perllib/FixMyStreet/App/Controller/Dashboard.pm:42 +msgid "There was a problem showing this page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 perllib/FixMyStreet/App/Controller/Report/Update.pm:135 templates/web/base/auth/general.html:51 templates/web/zurich/auth/general.html:28 +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3279,7 +3355,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "" @@ -3329,22 +3405,30 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 perllib/FixMyStreet/App/Controller/Report/New.pm:954 perllib/FixMyStreet/App/Controller/Report/New.pm:971 perllib/FixMyStreet/Cobrand/UK.pm:45 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 perllib/FixMyStreet/App/Controller/Report/New.pm:1049 perllib/FixMyStreet/App/Controller/Report/New.pm:942 perllib/FixMyStreet/App/Controller/Report/New.pm:986 perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -3361,7 +3445,7 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -3369,23 +3453,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -3393,7 +3477,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 templates/web/base/admin/timeline.html:1 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3401,19 +3485,19 @@ msgstr "" msgid "Tips for perfect photos" msgstr "" -#: templates/web/base/admin/flagged.html:15 templates/web/base/admin/index.html:61 templates/web/base/admin/reports.html:13 templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/flagged.html:15 templates/web/base/admin/index.html:61 templates/web/base/admin/reports.html:13 templates/web/base/admin/templates.html:6 templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "" -#: templates/web/base/admin/template_edit.html:13 templates/web/zurich/admin/template_edit.html:20 +#: templates/web/base/admin/template_edit.html:23 templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" @@ -3425,39 +3509,31 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 templates/web/base/admin/stats.html:24 templates/web/base/admin/stats.html:43 templates/web/base/admin/stats_fix_rate.html:4 templates/web/zurich/admin/stats.html:30 -msgid "Total" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 templates/web/base/dashboard/index.html:56 -msgid "Total reports received" +#: templates/web/base/admin/stats/fix_rate.html:4 templates/web/base/admin/stats/questionnaire.html:24 templates/web/base/dashboard/index.html:114 templates/web/base/dashboard/index.html:119 templates/web/base/dashboard/index.html:143 templates/web/zurich/admin/stats/index.html:30 +msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:134 templates/web/base/report/_item.html:104 +#: templates/web/base/report/_inspect.html:140 templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -3469,19 +3545,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" -#: templates/web/base/js/translation_strings.html:29 +#: templates/web/base/auth/smsform.html:17 templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "" @@ -3493,19 +3569,19 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 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 -msgid "Unconfirmed" +#: templates/web/base/admin/user-form.html:38 +msgid "Unban" msgstr "" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" +#: 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 +msgid "Unconfirmed" msgstr "" #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -3513,11 +3589,11 @@ msgstr "" msgid "Unknown error" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:112 perllib/FixMyStreet/App/Controller/Report.pm:118 perllib/FixMyStreet/App/Controller/Report.pm:121 +#: perllib/FixMyStreet/App/Controller/My.pm:200 perllib/FixMyStreet/App/Controller/Report.pm:112 perllib/FixMyStreet/App/Controller/Report.pm:118 perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -3541,11 +3617,11 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -3553,15 +3629,15 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/base/admin/update_edit.html:44 templates/web/zurich/admin/update_edit.html:25 +#: templates/web/base/admin/update_edit.html:46 templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -3573,19 +3649,19 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 perllib/FixMyStreet/App/Controller/Admin.pm:1326 perllib/FixMyStreet/App/Controller/Admin.pm:1489 perllib/FixMyStreet/App/Controller/Admin.pm:910 perllib/FixMyStreet/Cobrand/Zurich.pm:767 perllib/FixMyStreet/Cobrand/Zurich.pm:792 perllib/FixMyStreet/Cobrand/Zurich.pm:862 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 perllib/FixMyStreet/App/Controller/Admin.pm:1398 perllib/FixMyStreet/App/Controller/Admin.pm:1591 perllib/FixMyStreet/App/Controller/Admin.pm:933 perllib/FixMyStreet/Cobrand/Zurich.pm:767 perllib/FixMyStreet/Cobrand/Zurich.pm:792 perllib/FixMyStreet/Cobrand/Zurich.pm:862 msgid "Updated!" msgstr "" -#: templates/web/base/admin/list_updates.html:2 templates/web/base/report/update.html:5 templates/web/zurich/report/updates.html:2 +#: templates/web/base/admin/list_updates.html:2 templates/web/base/report/update.html:3 templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" @@ -3628,34 +3704,62 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 perllib/FixMyStreet/App/Controller/Admin.pm:1755 +msgid "User added to abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 perllib/FixMyStreet/App/Controller/Admin.pm:1752 +msgid "User already in abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" +#: templates/web/base/admin/report_blocks.html:18 templates/web/base/admin/user-form.html:38 templates/web/base/admin/users.html:32 +msgid "User in abuse table" msgstr "" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 perllib/FixMyStreet/Cobrand/Default.pm:728 perllib/FixMyStreet/Cobrand/Zurich.pm:403 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/report_edit.html:129 templates/web/base/admin/update_edit.html:36 +msgid "User:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 perllib/FixMyStreet/Cobrand/Default.pm:711 perllib/FixMyStreet/Cobrand/Zurich.pm:403 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 perllib/FixMyStreet/App/Controller/Admin.pm:417 perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 perllib/FixMyStreet/App/Controller/Admin.pm:385 perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 templates/web/base/auth/change_email.html:5 +msgid "Verify email address" +msgstr "" + +#: templates/web/base/auth/change_phone.html:1 templates/web/base/auth/change_phone.html:5 +msgid "Verify phone number" +msgstr "" + #: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/update_edit.html:18 templates/web/zurich/admin/report_edit-sdm.html:23 templates/web/zurich/admin/report_edit.html:24 templates/web/zurich/admin/update_edit.html:10 msgid "View report on site" msgstr "" @@ -3672,12 +3776,7 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -3686,18 +3785,22 @@ msgid "Wards of this council" msgstr "" #: templates/web/base/alert/choose.html:6 templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." +msgid "We found more than one match for that location." msgstr "" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 templates/web/base/report/display.html:35 templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "" @@ -3705,6 +3808,10 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "" +#: templates/web/base/alert/choose.html:12 templates/web/base/around/_error_multiple.html:12 +msgid "We show up to ten matches, please try a different search if yours is not here." +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 "" @@ -3713,8 +3820,8 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -3741,7 +3848,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -3761,6 +3868,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -3777,16 +3888,7 @@ msgstr "" msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 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:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:124 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 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:53 templates/web/base/report/_inspect.html:90 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 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:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:124 templates/web/base/admin/report_edit.html:95 templates/web/base/admin/update_edit.html:25 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:53 templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "" @@ -3798,7 +3900,7 @@ msgstr "" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -3814,7 +3916,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3837,7 +3939,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3845,7 +3947,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -3869,15 +3971,31 @@ msgstr "" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" -#: templates/web/base/auth/change_email.html:6 templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +msgid "You have successfully added your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" +#: templates/web/base/auth/change_phone.html:15 +msgid "You have successfully confirmed your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +msgid "You have successfully removed your phone number." +msgstr "" + #: templates/web/base/report/display.html:25 templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +msgid "You have successfully verified your phone number." +msgstr "" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -3900,23 +4018,27 @@ msgstr "" msgid "Your Reports" msgstr "" -#: templates/web/base/auth/change_password.html:11 templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 +#: templates/web/base/auth/change_password.html:11 templates/web/base/auth/generate_token.html:15 templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" -#: templates/web/base/alert/updates.html:19 templates/web/base/alert/updates.html:22 templates/web/base/contact/index.html:80 templates/web/base/report/display_tools.html:46 templates/web/base/report/display_tools.html:49 templates/web/base/report/new/form_user_loggedout_email.html:1 templates/web/base/report/update/form_user_loggedout_email.html:1 templates/web/zurich/report/new/fill_in_details_form.html:53 +#: templates/web/base/alert/updates.html:19 templates/web/base/alert/updates.html:22 templates/web/base/auth/general.html:44 templates/web/base/contact/index.html:80 templates/web/base/report/display_tools.html:46 templates/web/base/report/display_tools.html:49 templates/web/base/report/new/form_user_loggedout_email.html:6 templates/web/base/report/update/form_user_loggedout_email.html:6 templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" -#: templates/web/base/auth/change_email.html:9 templates/web/base/auth/general.html:57 templates/web/base/report/update/form_user_loggedout_email.html:5 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:58 +#: templates/web/base/auth/change_email.html:15 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" +#: templates/web/base/auth/general.html:42 templates/web/base/report/new/form_user_loggedout_email.html:2 templates/web/base/report/update/form_user_loggedout_email.html:2 +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 "" -#: templates/web/base/auth/general.html:109 templates/web/base/contact/index.html:74 templates/web/base/report/new/form_user_loggedout_by_email.html:17 templates/web/base/report/update/form_name.html:33 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:63 +#: templates/web/base/auth/general.html:114 templates/web/base/contact/index.html:74 templates/web/base/report/new/form_user_loggedout_by_email.html:21 templates/web/base/report/update/form_name.html:33 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:63 msgid "Your name" msgstr "" @@ -3924,19 +4046,19 @@ msgstr "" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 templates/web/base/report/new/form_user_loggedout_password.html:10 templates/web/base/report/update/form_user_loggedout_password.html:9 templates/web/zurich/auth/general.html:34 +#: templates/web/base/auth/general.html:84 templates/web/base/report/new/form_user_loggedout_password.html:10 templates/web/base/report/update/form_user_loggedout_password.html:9 templates/web/zurich/auth/general.html:34 msgid "Your password" msgstr "" @@ -3944,7 +4066,7 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/base/contact/index.html:87 templates/web/base/report/new/form_user_loggedout_by_email.html:26 templates/web/zurich/report/new/fill_in_details_form.html:69 +#: templates/web/base/auth/change_phone.html:19 templates/web/base/contact/index.html:87 templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "" @@ -3952,7 +4074,7 @@ msgstr "" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "" @@ -3960,23 +4082,35 @@ msgstr "" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +msgid "Your token has been generated" +msgstr "" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:7 templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/category-checkboxes.html:7 templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 perllib/FixMyStreet/App/Controller/Moderate.pm:85 perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -3992,7 +4126,7 @@ msgstr "" msgid "didn't use map" msgstr "" -#: templates/web/base/alert/index.html:33 templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4012,19 +4146,19 @@ msgstr "" msgid "less than a minute" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 templates/web/base/admin/questionnaire.html:15 templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 templates/web/base/admin/stats/questionnaire.html:15 templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "" -#: templates/web/base/admin/category-checkboxes.html:8 templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/category-checkboxes.html:8 templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "" @@ -4052,7 +4186,7 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4060,11 +4194,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4072,14 +4206,22 @@ msgstr "" msgid "used map" msgstr "" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +msgid "user not in abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +msgid "user removed from abuse list" +msgstr "" + #: templates/web/base/reports/body.html:0 templates/web/base/reports/body.html:3 msgid "ward" msgstr "" @@ -4140,35 +4282,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po index 70eda654cbf..416db9a45b3 100644 --- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Arabic (https://www.transifex.com/mysociety/teams/12067/ar/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "و" @@ -32,6 +32,10 @@ msgstr "و" msgid " or " msgstr "أو" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d تم التعديل بواسطة %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s معلومات اتصال المجلس – %s مؤكدة, %s غير مؤكدة" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -75,7 +79,7 @@ msgstr "" "المشكلات الواقعة ضمن مسافة معينة من موقع معين." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -89,6 +93,11 @@ msgstr "" msgid "%s live updates" msgstr "%s تحديثات مباشرة" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s الأسئلة المرسلة – %s المجابة (%s%%)" @@ -97,7 +106,7 @@ msgstr "%s الأسئلة المرسلة – %s المجابة (%s%%)" msgid "%s ref: %s" msgstr "مرجع: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© OpenStreetMap المساهمون" @@ -105,11 +114,6 @@ msgstr "© OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(الخلل وموقع الخلل)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(البريد في لائحة المسيئين)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -145,7 +149,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "( مثل الكتابة على الجدران ، رمي النفايات في الاماكن الغير مخصصة ، بلاطات ارصفة مكسورة او انارة الشوارع)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -167,8 +171,8 @@ msgstr "(أرسل لكليهما)" msgid "(we also have RSS feeds for problems within %s)" msgstr "موجز RSS للمشكلات الموجودة ضمن حدود %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "--إختر تصنيف--" @@ -181,14 +185,6 @@ msgstr "-اختر قالب---" msgid "10 inch pothole on Example St, near post box" msgstr "حفرة بعمق 10 انشات على شارع مثال قرب صندوق البريد" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -200,17 +196,17 @@ msgstr "" " هذا هو السبب المرجح وراء كون \"منطقة التغطية\" فارغة (أدناه).
\n" " هل تريد إضافة بعض MAPIT_TYPES إلى ملف التكوين؟" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -219,33 +215,52 @@ msgstr "" msgid "%s live problems" msgstr "%s المشاكل الحالية" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "لا دعني أؤكّد بلاغي بالبريد" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "لا دعني أؤكّد بلاغي بالبريد" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "لا دعني أؤكّد تحديثي بالبريد" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "لا دعني أؤكّد تحديثي بالبريد" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "لا دعني أسجّل دخولي بالبريد" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "لا دعني أسجّل دخولي بالبريد" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "ملاحظة: لم يتم ارسال هذا التقرير للتطبيق بعد. لن يتم ارسال اي تغييرات اخرى عليه." -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "نعم لدي كلمة المرور" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -262,11 +277,17 @@ msgid "Add a contact using the form below." msgstr "أضف عنوان اتصال عبر النموذج التالي." #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "إضافة هيئة" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "حظر البريد الإلكتروني" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -289,11 +310,17 @@ msgstr "أضف تصنيفاً" msgid "Add option" msgstr "إختياري" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "اضف للقائمة القصيرة" @@ -303,23 +330,23 @@ msgstr "اضف للقائمة القصيرة" msgid "Add user" msgstr "إضافة مستخدم" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "اضف / عدل اصناف المشاكل" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "اضف/عدل أولويات الاستجابة" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "اضف/عدل قوالب الاستجابة" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "أُضيف %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "اضافة التقرير للقائمة القصيرة خاصتك سيحذفه من %s’s القائمة القصيرة." @@ -343,9 +370,10 @@ msgstr "التحذير %d ألغي تفعيله (أنشيء %s)" msgid "Alert me to future updates" msgstr "نبهني بأحدث المستجدات" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -354,12 +382,13 @@ msgstr "" msgid "All Reports" msgstr "كل التقارير" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "جميع التقارير بتنسيق CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "كل التصنيفات" @@ -375,17 +404,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "كل التقارير" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "كل البلاغات بين %s و %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -423,7 +452,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "هل أنت متأكد أنك تريد إلغاء الرفع؟" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "هل أنت متأكد؟" @@ -434,7 +464,7 @@ msgstr "هل أنت متأكد؟" msgid "Area covered" msgstr "المنطقة المغطاة" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "المنطقة:" @@ -448,7 +478,7 @@ msgid "Assign to competent body:" msgstr "تعيين إلى الهيئة المختصة:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "تعيين إلى فئة أخرى:" @@ -460,7 +490,7 @@ msgstr "تعيين إلى هيئة خارجية:" msgid "Assign to subdivision:" msgstr "تعيين إلى قسم فرعي:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "تعيين المستخدمين للمناطق" @@ -476,12 +506,17 @@ msgstr "في الغالب، يتم إرجاع %d من الطلبات في كل msgid "At the moment only searching for and looking at reports work." msgstr "حاليا مايعمل هو البحث ورؤية البلاغات فقط." -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "مستخدمين " -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "الإستجابة الآلية:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "الإستجابة الآلية:" @@ -489,18 +524,10 @@ msgstr "الإستجابة الآلية:" msgid "Available categories" msgstr "التصنيفات المتاحة" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "تفادى المعلومات الشخصية ولوحات السيارات" @@ -514,20 +541,21 @@ msgstr "في إنتظار المشرفين" msgid "Back" msgstr "الخلف" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "عد إلى كل التقارير" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "حظر البريد الإلكتروني" +#, fuzzy +msgid "Ban user" +msgstr "مستخدم مشار إليه" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "الهيئات" @@ -538,14 +566,10 @@ msgstr "الهيئات" msgid "Body" msgstr "الهيئة" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "الهيئة:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "بالتاريخ" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -558,8 +582,9 @@ msgstr "لا تستطيع العثور على رسالة البريد الإلك msgid "Can't see the map? Skip this step" msgstr "لا يمكنك رؤية الخريطة؟ تجاوز هذه الخطوة" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "تصنيفات" @@ -570,30 +595,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "تصنيف" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "تصنيف" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "تصنيف تغير من ‘%s’ إلى ‘%s’" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "معدل إصلاحات الفئة للمشكلات التي مضى عليها أكثر من 4 أسابيع" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -601,17 +632,18 @@ msgstr "معدل إصلاحات الفئة للمشكلات التي مضى عل msgid "Category:" msgstr "تصنيف:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "تصنيف: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "تغيير البريد الإلكتروني" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "تغيير عنوان البريد الإلكتروني" @@ -619,10 +651,16 @@ msgstr "تغيير عنوان البريد الإلكتروني" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "تغيير كلمة المرور" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(بلا رقم هاتف)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "تفقد مطلوب الفحص اذا كانت التقارير في الفئة تستوجب الفحص قبل الارسال" @@ -651,19 +689,14 @@ msgstr "" "اختر اسم تصنيف يكون منطقيا لعامة الناس (مثل، \"أخدود\"، \"إنارة الطريق\") ومساعد.\n" "للجهات المسئولة أيضا. هذه سوف تظهر في القائمة المنسدلة من صفحة إبلاغ-عن-مشكلة." -#: templates/web/base/report/_inspect.html:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "اضغط هنا أو ادخل كـ يوم\\شهر\\سنة" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "اضغط على الخريطة للإبلاغ عن مشكلة" @@ -692,18 +725,19 @@ msgstr "انقر فوق الارتباط المرفق في رسالة البري #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "مغلق" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "مغلق من الجهة المسئولة" @@ -718,16 +752,17 @@ msgid "Cobrand" msgstr "علامة تجارية مشتركة" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "بيانات العلامة التجارية المشتركة:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "علامة تجارية مشتركة:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -735,7 +770,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "إعدادت" @@ -744,7 +779,7 @@ msgstr "إعدادت" msgid "Confirm" msgstr "تأكيد" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "أكد الحساب" @@ -763,14 +798,10 @@ msgstr "تأكيد" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "مؤكد" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "البلاغات المؤكدة بين %s و %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -797,8 +828,8 @@ msgstr "اتصل بفريق العمل" msgid "Coordinates:" msgstr "الإحداثيات:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "لم يتمكن من إيجاد المستخدم" @@ -816,43 +847,16 @@ msgstr "المجلس" msgid "Council contacts for %s" msgstr "جهات اتصال المجلس لـ %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "مرجع المجلس: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "المجلس:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "العدد" @@ -874,40 +878,45 @@ msgstr "انشء تصنيف" msgid "Create priority" msgstr "انشء أولوية" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "انشاء التبليغات/تحديثات بالنيابة عن مستخدم" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "انشاء التبليغات/تحديثات كالمجلس" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "انشاء التبليغات/تحديثات بالنيابة عن مستخدم" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "إنشاء قالب" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "تم الإنشاء" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "تم الإنشاء:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "الوضع الحالي" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -918,14 +927,14 @@ msgstr "حاليا لايوجد جهات مسئولة تم إنشائها." msgid "Customer not contactable" msgstr "لا يمكن الاتصال بالعميل" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "صفحة المستخدم" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "تم التعامل بواسطة القسم الفرعي في غضون 5 أيام عمل" @@ -938,12 +947,12 @@ msgstr "" msgid "Default priority" msgstr "انشء أولوية" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "حذف القالب" @@ -954,8 +963,8 @@ msgstr "حذف القالب" msgid "Deleted" msgstr "محذوف" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -971,6 +980,10 @@ msgstr "الوصف" msgid "Description:" msgstr "الوصف:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -983,6 +996,10 @@ msgstr "التفاصيل" msgid "Details:" msgstr "التفاصيل:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "تم التحويل" @@ -996,8 +1013,8 @@ msgstr "لم يتم استخدام الخريطة" msgid "Diligency prize league table" msgstr "جدول رابطة جائزة العناية بالدقة" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -1006,7 +1023,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "لا ترسل اشعارات البريد الالكتروني حول التعليقات المأخوذة لصانع المشكلة" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1014,7 +1031,7 @@ msgstr "لا ترسل اشعارات البريد الالكتروني حول ا msgid "Do you have a %s password?" msgstr "هل لديك كلمة مرور %s؟" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1034,11 +1051,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "اسحب الصور واسقطها هنا أو انقر للرفع" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1061,9 +1078,10 @@ msgstr "باتجاه الشرق /باتجاه الشمال:" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "تعديل" @@ -1073,33 +1091,33 @@ msgstr "تعديل" msgid "Edit body details" msgstr "تعديل تفاصيل الجهة المسئولة" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "عدل تفاصيل المستخدمين الآخرين" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "عدل صلاحيات المستخدمين الآخرين" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "عدل تصنيف التقرير" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "عدل أولوية التقرير" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "عدل التقارير" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "تعديل المشكلة %d" @@ -1120,7 +1138,6 @@ msgstr "المحرر" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1128,17 +1145,20 @@ msgstr "المحرر" msgid "Email" msgstr "البريد الإلكتروني" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "البريد أضيف إلى لائحة المسيئين" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "البريد الإلكتروني" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "البريد الإلكتروني" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "تم إنشاء الإخطار بالبريد" @@ -1147,19 +1167,18 @@ msgstr "تم إنشاء الإخطار بالبريد" msgid "Email alert deleted" msgstr "تم حذف الإخطار بالبريد" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "البريد موجودا سابقا في لائحة المسيئين" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "البريد الإلكتروني:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "البريد الإلكتروني: %s" @@ -1176,8 +1195,8 @@ msgstr "" "لمزيد من المعلومات، راجع\n" "هذه المقالة." +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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" @@ -1187,8 +1206,9 @@ msgstr "" "لها نقطة نهاية مختلفة (وأسلوب إرسال مختلف) عن نقطة نهاية وأسلوب إرسال الهيئة. على سبيل المثال، إذا كانت تقارير بعض فئات\n" "المشكلة يجب إرسالها عبر البريد الإلكتروني، بينما تقارير أخرى يمكن إرسالها عبر Open311." -#: templates/web/base/admin/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "تاريخ الإنتهاء:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1209,14 +1229,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "أدخل أقرب صندوق بريد، أو اسم الشارع والحي" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "أدخل أقرب اسم شارع وحي" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "أدخل كلمة المرور:" @@ -1234,8 +1254,8 @@ msgstr "أدخل تفاصيل البلاغ" msgid "Error" msgstr "خطأ" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "الكل" @@ -1260,7 +1280,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "وضح ما هي المشكلة" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1276,7 +1296,7 @@ msgstr "خارجي" msgid "External ID" msgstr "معرف خارجي" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "رابط خارجي" @@ -1288,7 +1308,7 @@ msgstr "هيئة خارجية" msgid "External team" msgstr "فريق خارجي" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1300,7 +1320,7 @@ msgstr "تفاصيل إضافية" msgid "Extra data:" msgstr "بيانات إضافية:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "تفاصيل إضافية" @@ -1330,21 +1350,22 @@ msgstr "يمكن إصلاح ذلك عن طريق اختيار منطقة #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "تم الإصلاح" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "تم الإصلاح - المجلس" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "تم الإصلاح - المستخدم" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "مشار كمحذوف" @@ -1352,7 +1373,7 @@ msgstr "مشار كمحذوف" msgid "Flag user" msgstr "مستخدم مشار إليه" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "مشار إليهم" @@ -1361,7 +1382,7 @@ msgstr "مشار إليهم" msgid "Flagged reports and users" msgstr "بلاغات ومستخدمين مشار إليهم" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "المستخدمين المشار إليهم مدرجين بقائمة في صفحة المشار إليهم" @@ -1369,8 +1390,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "مشار إليه:" @@ -1390,7 +1411,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "للمزيد من المعلومات، راجع كيف أصلح شارعي يستخدم الخريطة." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1410,8 +1431,12 @@ msgstr "تمت إعادة توجيه الطلب إلى هيئة خارجية" msgid "Frequently Asked Questions" msgstr "الأسئلة الشائعة" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1444,12 +1469,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "اذهب" @@ -1457,7 +1482,7 @@ msgstr "اذهب" msgid "Going to send questionnaire?" msgstr "هل تريد أن ترسل سؤال؟" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "إعطاء تصريح للأدمن" @@ -1465,6 +1490,15 @@ msgstr "إعطاء تصريح للأدمن" msgid "Graph of problem creation by status over time" msgstr "الرسم البياني للإبلاغ عن المشكلات حسب الحالة مع مرور الوقت" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "بواسطة %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "هل أصلحت هذه المشكلة؟" @@ -1485,21 +1519,26 @@ msgstr "المساعدة" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "ساعد %s على حل مشكلتك اسرع من خلال توفير تفاصيل اضافية.لن تنشر هذه المعلومات الاضافية عند الاتصال بالانترنت." +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "صور التقارير القريبة الحديثة" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "مرحبا %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "مخفي" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1520,21 +1559,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "أخفي القديم" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "أخفي المثبتة" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1546,7 +1582,7 @@ msgstr "" msgid "History" msgstr "السجل" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "البداية" @@ -1605,6 +1641,10 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1613,6 +1653,10 @@ msgstr "" "إذا كانت توجد هيئتان أو أكثر تخدمان نفس الموقع، فإن FixMyStreet يجمع الفئات المتطابقة في إدخال واحد في\n" " القائمة. تأكد من استخدام اسم الفئة نفسها في الهيئات إذا كنت تريد حدوث ذلك." +#: templates/web/base/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "إذا حصلت على معلومات أكثر عن حالة مشكلتك, الرجاء العودة للموقع ووضع تحديث لذلك." @@ -1621,7 +1665,7 @@ msgstr "إذا حصلت على معلومات أكثر عن حالة مشكلت 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 "اذا كنت تريد ان تكون هذه الاولوية خيارا لفئة معينة، قم باختيارها هنا. سوف تظهر لكل الفئات افتراضيا." -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "اذا كنت تريد ان تكون هذا النموذج خيارا لفئة معينة، قم باختيارها هنا. سوف تظهر لكل الفئات افتراضيا." @@ -1630,7 +1674,7 @@ msgstr "اذا كنت تريد ان تكون هذا النموذج خيارا ل msgid "If you submit a problem here the problem will not be reported to the council." msgstr "في حالة تقديم مشكلة هنا، لن يتم الإبلاغ عن المشكلة للمجلس." -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1712,11 +1756,7 @@ msgstr "علبة الواردة فارغة، ها قد وصلنا!" msgid "Include reporter personal details" msgstr "تضمين البيانات الشخصية للمبلّغ" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "تضمين التقارير غير المؤكدة" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "قيمة has_photo غير صحيحة \"%s\"" @@ -1728,7 +1768,7 @@ msgstr "" msgid "Inspection required" msgstr "يتطلب المعاينة" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "وجه المقاولون لإصلاح المشاكل" @@ -1740,26 +1780,18 @@ msgstr "ملاحظات داخلية" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "قيمة agency_responsible غير صالحة %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "تاريخ نهاية غير صالح" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "التنسيق المحدد %s غير صالح." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "موقع غير صحيح. على الموقع الجديد ان يكون تحت نفس المجلس." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "تاريخ البداية غير صالح" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "أسرع طريقة عادةً هي الاطلاع على الأسئلة المتداولة والبحث عما إذا كانت الإجابة موجودة هناك أم لا." @@ -1778,7 +1810,7 @@ msgstr "الصلاحية القضائية غير معروفة" msgid "Jurisdiction unknown" msgstr "الصلاحية القضائية غير معروفة" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1803,12 +1835,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1834,18 +1861,14 @@ msgstr "آخر تحديث:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "الاقل تحديثا مؤخرا" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1854,13 +1877,13 @@ msgstr "" msgid "List all reported problems" msgstr "عرض جميع المشكلات المبلّغ عنها" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "جارٍ التحميل..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1892,12 +1915,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1905,11 +1931,11 @@ msgstr "" msgid "MAP" msgstr "الخريطة" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "ادارة القائمة القصيرة" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1921,11 +1947,11 @@ msgstr "الخريطة" msgid "Mark as sent" msgstr "اشر كمرسلة" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "تحديد المستخدمين الذين تريد وضع علامة على سلوكهم بأنه مشار إليه." -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "حدد تفاصيل المشكلة." @@ -1945,45 +1971,45 @@ msgstr "رسالة إلى الهيئة الخارجية:" msgid "Missing bodies:" msgstr "هيئات مفقودة:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr " jurisdiction_id غير موجود" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "إشراف" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "قم بالاشراف على تفاصيل التبليغ" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "قم بالاشراف على التبليغ" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "تمت المعالجة بواسطة القسم خلال يوم عمل واحد" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "الشهر" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "الأكثر تعليقا" @@ -2001,9 +2027,9 @@ msgstr "الأكثر تعليقا" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2014,19 +2040,24 @@ msgstr "الاسم" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "الاسم:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "الاسم: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "انتقل الى هذه المشكلة" +#: templates/web/base/report/_inspect.html:39 +#, fuzzy +msgid "Nearest calculated address:" +msgstr "بريد إلكتروني جديد:" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2036,12 +2067,12 @@ msgstr "أقرب طريق مسمى للدبوس الموضوع على الخري msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "أقرب رمز بريدي للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا): %s (على بعد %s متر)" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "أقرب شارع مسمى للدبوس الموضوع على الخريطة (يتم إنشاؤه تلقائيًا باستخدام خرائط Bing): %s" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2055,20 +2086,25 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "أوشكنا على الانتهاء! راجع البريد الإلكتروني الآن…" +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "أوشكنا على الانتهاء! راجع البريد الإلكتروني الآن…" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 #, fuzzy msgid "New" msgstr "الأحدث" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "تمت إضافة هيئة جديدة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "تمت إضافة جهة اتصال جديدة للفئة" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "بريد إلكتروني جديد:" @@ -2089,6 +2125,11 @@ msgstr "ملاحظة جديدة لرئيس المنطقة:" msgid "New password:" msgstr "كلمة مرور جديدة:" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(بلا رقم هاتف)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2118,18 +2159,19 @@ msgstr "مشكلات جديدة ضمن حدود {{NAME}} على FixMyStreet" msgid "New reports" msgstr "تقارير جديدة" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "حالة جديدة" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "قالب جديد" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "الأحدث" @@ -2137,7 +2179,7 @@ msgstr "الأحدث" msgid "Next" msgstr "التالي" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2149,22 +2191,18 @@ msgstr "التالي" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "لا" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "لاتوجد منطقة" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "لا هيئة" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "لا مجلس" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "لم يتم تحديد مجلس" @@ -2194,6 +2232,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "لم يتم إرجاع أي نتائج" @@ -2218,8 +2260,8 @@ msgstr "لا يوجد داعمون" msgid "None" msgstr "بلا" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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." @@ -2228,8 +2270,8 @@ msgstr "" " يمكن إقران المستخدمين الموظفين المعتمدين بالمنطقةالتي يعملون فيها.
\n" " " -#: templates/web/base/admin/user-form.html:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2252,7 +2294,7 @@ msgstr "لا يمكن الاتصال به" msgid "Not for my subdivision" msgstr "ليس للقسم الفرعي التابع له" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "لم يقوموا بالإبلاغ من قبل" @@ -2266,10 +2308,6 @@ msgstr "لم يتم إبلاغ المجلس" msgid "Note" msgstr "ملاحظة" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "لاحظ أنه عند تضمين التقارير غير المؤكدة فإننا نستخدم تاريخ إنشاء التقرير والذي قد لا يكون في نفس شهر تأكيد التقرير، لذلك قد تتغير الأرقام قليلاً." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2297,37 +2335,46 @@ msgstr "الآن حان وقت تقديم التقرير…" msgid "Now to submit your update…" msgstr "الآن حان وقت تقديم التحديث…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "موافق" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "حالة قديمة" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "الأقدم" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2367,23 +2414,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "أخرى" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "مناطق أخرى:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2401,19 +2455,19 @@ msgstr "لم يتم العثور على الصفحة" msgid "Parent" msgstr "العنصر الرئيسي" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "جزئي" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "كلمة المرور (اختياري)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "كلمة المرور:" @@ -2421,7 +2475,7 @@ msgstr "كلمة المرور:" msgid "Permalink" msgstr "الارتباط الثابت" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "الصلاحيات:" @@ -2430,19 +2484,25 @@ msgstr "الصلاحيات:" msgid "Phone Reporter:" msgstr "تم الإبلاغ:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "رقم الهاتف" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "رقم الهاتف (اختياري)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "تم الإبلاغ:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "الهاتف:" @@ -2458,7 +2518,7 @@ msgstr "الهاتف:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2484,12 +2544,17 @@ msgstr "الصور" msgid "Photos of recent nearby reports" msgstr "صور التقارير القريبة الحديثة" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "وضع دبوس على الخريطة" @@ -2511,25 +2576,34 @@ msgstr "الرجاء التحلي بالأدب والاختصار والتركي msgid "Please check the passwords and try again" msgstr "الرجاء التحقق من كلمات المرور وإعادة المحاولة" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "الرجاء التحقق من أن عنوان البريد الإلكتروني صحيح" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "الرجاء التحقق من أن عنوان البريد الإلكتروني صحيح" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "الرجاء اختيار فئة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "الرجاء تصحيح الأخطاء التالية" @@ -2547,39 +2621,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "الرجاء عدم إساءة الاستعمال؛ فإساءة استعمال المجلس يتسبب في تقليل قيمة الخدمة المقدمة لكل المستخدمين." -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "الرجاء إدخال رسالة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "الرجاء إدخال رقم الهاتف" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "الرجاء إدخال اسمك" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "الرجاء ادخال اسم لهذه الهيئة." #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "الرجاء إدخال كلمة مرور" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "الرجاء إدخال موضوع" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "الرجاء إدخال بريد إلكتروني صالح" @@ -2588,55 +2670,62 @@ msgstr "الرجاء إدخال بريد إلكتروني صالح" msgid "Please enter a valid email address" msgstr "الرجاء إدخال عنوان بريد إلكتروني صالح" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "الرجاء إدخال رقم الهاتف" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "الرجاء إدخال بعض التفاصيل" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "الرجاء إدخال البريد الإلكتروني" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "الرجاء إدخال عنوان بريدك الإلكتروني" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "الرجاء إدخال الاسم الأول" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "الرجاء إدخال اسمك" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "الرجاء إدخال رقم الهاتف" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "الرجاء إدخال الاسم الثاني" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "الرجاء إدخال اللقب" @@ -2685,7 +2774,12 @@ msgstr "يرجى ملاحظة أن تحديثك لم يتم نشره ب msgid "Please note:" msgstr "الرجاء ملاحظة:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "الرجاء تقديم تحديث عام لهذا التقرير." + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "الرجاء تقديم تحديث عام لهذا التقرير." @@ -2725,6 +2819,11 @@ msgstr "الرجاء تحديد ما إذا كانت المشكلة قد تم ح msgid "Please upload an image only" msgstr "الرجاء تحميل صورة فقط" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "الرجاء كتابة رسالة" @@ -2734,7 +2833,7 @@ msgid "Please write your update here" msgstr "الرجاء كتابة التحديث هنا" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "نشر" @@ -2743,15 +2842,15 @@ msgstr "نشر" msgid "Posted anonymously at %s" msgstr "نشر بدون تحديد الهوية في %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "تم النشر بواسطة %s في %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "تم النشر بواسطة %s (%s) في %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "تم النشر بواسطة %s في %s" @@ -2763,11 +2862,11 @@ msgstr "مشغّل بواسطة مفتاح API للإشارة إلى أن التقارير يتم\n" " إرسالها إلى لنظام FixMyStreet المثبت." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "بعض صور التقارير الحديثة" @@ -3529,15 +3641,20 @@ msgstr "بعض النص لترجمته" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "عذرًا، يبدو هذا أنه رمز بريدي خاص بإحدى تبعيات التاج البريطاني، ونحن لا نغطي ذلك." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "عذرًا، لم يكن هذا الارتباط صالحًا" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "عذرًا، لم يكن هذا الارتباط صالحًا" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "عذرًا، حدث خطأ أثناء تأكيد المشكلة." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3570,20 +3687,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "للأسف، ليس لديك صلاحية لفعل ذلك." -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "رتب بواسطة" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "مستخدم الموظف لديه الصلاحية للدخول للأدمن" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "الموظف:" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "تاريخ البداية:" #: templates/web/base/admin/body.html:73 @@ -3593,15 +3711,18 @@ msgstr "تاريخ البداية:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "الحالة" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "حفظ التغييرات" @@ -3615,17 +3736,19 @@ msgstr "حفظ التغييرات" msgid "State:" msgstr "الحالة:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "الحالة" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "الإحصائيات" @@ -3635,7 +3758,7 @@ msgstr "الإحصائيات" msgid "Status" msgstr "الحالة" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "لا تزال مفتوحة، عبر الاستبيان، %s" @@ -3648,7 +3771,12 @@ msgstr "عرض الشارع" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "الفئة الفرعية: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "الفئة الفرعية: %s" @@ -3665,18 +3793,19 @@ msgstr "الموضوع" msgid "Subject:" msgstr "الموضوع:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "تقديم" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3718,7 +3847,7 @@ msgstr "لخص المشكلة" msgid "Summarise your changes" msgstr "لخص تغييراتك" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3726,25 +3855,31 @@ msgstr "لخص تغييراتك" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "ملخص" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "ملخص التقارير" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "ملخص التقارير" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "مستخدم خارق" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "المستخدم الخارق له ترخيص لتنفيذ strong>كل اعمال التي يمكن للأدمن عملها." -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "نتائج التصفح" @@ -3752,14 +3887,14 @@ msgstr "نتائج التصفح" msgid "Template «%s»" msgstr "القالب «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "القوالب" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "النص" @@ -3767,7 +3902,7 @@ msgstr "النص" msgid "Text only version" msgstr "إصدار نصي فقط" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3794,7 +3929,7 @@ msgstr "شكرًا لك على استفسارك" msgid "Thank you for your feedback" msgstr "شكرًا لك على تعليقاتك" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "شكرًا لك على تحميل الصورة. نحن نحتاج الآن تحديد موقع المشكلة، لذا يرجى إدخال اسم شارع قريب أو رمز بريدي في المربع الموجود بالأعلى :" @@ -3810,7 +3945,7 @@ msgstr "يبدو أنه لم يتم تحميل هذه الصورة بصورة س msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "لا يبدو أن هذا الموقع ضمن صلاحيات المجلس؛ ربما يكون موقعًا بحريًا أو خارج حدود المحافظة. الرجاء إعادة المحافظة." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "لا يبدو أن هذا الموقع يقع في المملكة المتحدة؛ الرجاء إعادة المحاولة." @@ -3820,11 +3955,11 @@ msgstr "لا يبدو أن هذا الموقع يقع في المملكة الم msgid "That postcode was not recognised, sorry." msgstr "لم يتم التعرف على هذا الرمز البريدي، عذرًا." -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "تم وضع علامة على هذه المشكلة بأنها أُرسلت." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "ستتم إعادة إرسال هذه المشكلة الآن." @@ -3862,8 +3997,8 @@ msgstr "" "الصلاحية القضائية مطلوب تحديدها فقط إذا كانت نقطة النهاية تخدم أكثر من\n" " واحدة. إذا كانت الهيئة تدير نقطة النهاية الخاصة بها، فيمكن ترك هذا الحقل خاليًا." +#: templates/web/base/admin/body-form.html:101 #: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3900,8 +4035,8 @@ msgstr "لن يتمكن المجلس من تقديم المساعدة ما لم msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "يعرض جدول رابطة جائزة العناية بالدقة نشاط المحررين (الأشخاص الذين يحررون معظم السجلات)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "الخطأ هو: %s" @@ -3943,7 +4078,7 @@ msgstr "المشكلات الأخيرة المبلغ بأنها أُصلحت ب msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "المشكلات الأخيرة المبلغ عنها ضمن حدود {{NAME}} والمبلغ عنها بواسطة المستخدمين" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "من المحتمل أن الارتباط انتهت صلاحيته، أو ربما لم يتم نسخه ولصقه بصورة سليمة." @@ -3968,7 +4103,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "تعذر على المستخدم تحديد موقع المشكلة على الخريطة، ولكن يجب البحث عن المنطقة حول الموقع الذي أدخله" @@ -3981,33 +4116,38 @@ msgstr "" "يُعرض اسم المستخدم بصورة عامة على التقارير التي لم يتم وضع علامة مجهول عليها.\n" " لا تكون الأسماء فريدة بالضرورة." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "لا توجد تقارير لعرضها." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "حدثت مشكلة أثناء عرض صفحة \"كل التقارير\". الرجاء إعادة المحاولة لاحقًا." #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "حدثت مشكلة أثناء عرض هذه الصفحة. الرجاء إعادة المحاولة لاحقًا." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "حدثت مشكلة في توليفة البريد الإلكتروني/كلمة المرور. إذا كنت لا تستطيع تذكر كلمة المرور، أو كنت لا تمتلك كلمة مرور، فالرجاء تعبئة قسم ‘تسجيل الدخول بواسطة البريد الإلكتروني’ في النموذج." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "حدثت مشكلة في توليفة البريد الإلكتروني/كلمة المرور. الرجاء إعادة المحاولة." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "حدثت مشكلة في توليفة البريد الإلكتروني/كلمة المرور. إذا كنت لا تستطيع تذكر كلمة المرور، أو كنت لا تمتلك كلمة مرور، فالرجاء تعبئة قسم ‘تسجيل الدخول بواسطة البريد الإلكتروني’ في النموذج." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "حدثت مشكلة مع تحديثك. الرجاء المحاولة مرة آخرى." @@ -4015,7 +4155,7 @@ msgstr "حدثت مشكلة مع تحديثك. الرجاء المحاولة م msgid "There were problems with your report. Please see below." msgstr "حدثت مشكلات في التقرير. الرجاء الاطلاع على ما يلي." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "حدثت مشكلات في التحديث. الرجاء الاطلاع على ما يلي." @@ -4080,26 +4220,34 @@ msgstr "" "ستُرسل إلى هذه الهيئة تقارير المشكلات التي تقع في منطقة التغطية فقط.\n" " لن تتلقى الهيئة أي تقارير ما لم تكن تغطي منطقة واحدة على الأقل." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "هذه المعلومات مطلوبة" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "هذا موقع مطور، وقد تتعطل الأمور في أي وقت، وستُحذف قاعدة البيانات بصورة دورية." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "مضى شهرين على وجود هذه الحفرة و...." @@ -4116,7 +4264,7 @@ msgstr "لم يتم إصلاح هذه المشكلة" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4126,23 +4274,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "هذا التقرير في انتظار اعتماد الإشراف." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "هذا التقرير عليه علامة \"مغلق\" حاليًا." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "هذا التقرير عليه علامة \"تم الإصلاح\" حاليًا." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "هذا التقرير عليه علامة \"مفتوح\" حاليًا." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "تم تقديم هذا التقرير بدون تحديد الهوية" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "تحتوي صفحة الويب هذه على صورة للمشكلة، تم تقديمها بواسطة المستخدم." @@ -4153,7 +4301,7 @@ msgstr "تحتوي صفحة الويب هذه على صورة للمشكلة، msgid "Time spent (in minutes):" msgstr "الوقت المستغرق (بالدقائق):" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "المخطط الزمني" @@ -4165,20 +4313,21 @@ msgstr "نصائح لصور مثالية" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "العنوان" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "العنوان:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "لاكتشاف التنبيهات المحلية التي لدينا لك، الرجاء إدخال الرمز البريدي لـ %s أو اسم الشارع أو المنطقة:" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "لاكتشاف التنبيهات المحلية التي لدينا لك، الرجاء إدخال الرمز البريدي أو اسم الشارع أو المنطقة" @@ -4190,44 +4339,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "لعرض خريطة موضح عليها الموقع الدقيق لهذه المشكلة" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "الإجمالي" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "الإجمالي" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "هل يتطلب إدارة المرور؟" @@ -4240,18 +4381,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "موثوق من الهيئات:" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "موثوق به لأنشاء تبليغات بدون الحاجة الى تدقيقها" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "موثوق:" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "أعد المحاولة" @@ -4266,7 +4408,11 @@ msgstr "جرّب إرسال البريد الإلكتروني إلينا مبا msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4275,15 +4421,11 @@ msgstr "" msgid "Unconfirmed" msgstr "غير مؤكد" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "التقارير التي لم يتم إصلاحها" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "غير معروف" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "نوع تنبيه غير معروف" @@ -4293,13 +4435,14 @@ msgstr "نوع تنبيه غير معروف" msgid "Unknown error" msgstr "خطأ غير معروف" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "معرف المشكلة غير معروف" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4324,12 +4467,12 @@ msgstr "تمت إضافة التحديث التالي بدون تحديد اله msgid "Update below added by %s at %s" msgstr "تمت إضافة التحديث التالي بواسطة %s في %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "نص التحديث" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "تصنيف التحديث حسب الحالة" @@ -4337,16 +4480,16 @@ msgstr "تصنيف التحديث حسب الحالة" msgid "Update by {{name}}" msgstr "التحديث حسب {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "غيّر التحديث حالة المشكلة إلى %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "أدى التحديث إلى وضع علامة على المشكلة بأنه تم إصلاحها" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "أدى التحديث إلى إعادة فتح المشكلة" @@ -4360,20 +4503,20 @@ msgstr "حالات التحديث" msgid "Updated" msgstr "تم التحديث" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "تم النشر بواسطة %s (%s) في %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "تم النشر بواسطة %s في %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4381,7 +4524,7 @@ msgid "Updated!" msgstr "تم التحديث!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "التحديثات" @@ -4428,40 +4571,81 @@ msgstr "تم استخدام الخريطة" msgid "User ID to attribute fetched comments to" msgstr "التعليق المأخوذ ينتمي الى مستخدم معرف" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "البريد أضيف إلى لائحة المسيئين" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "البريد موجودا سابقا في لائحة المسيئين" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "تمت إزالة إشارة المستخدم" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "تم وضع إشارة للمستخدم" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "في جدول المسيئين؟" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "عثر البحث الذي نفذه المستخدم على مطابقات في أسماء المستخدمين وعناوين البريد الإلكتروني." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "المستخدمون" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "المستخدمون" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "يمكن للمستخدمين تنفيذ الاوامر التاليه في مناطقهم او هيئاتهم المعينة." -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "تم تحديث القيم" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "بريد إلكتروني جديد:" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "رقم الهاتف" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4483,12 +4667,7 @@ msgstr "عرض موقع" msgid "Viewing a problem" msgstr "عرض مشكلة" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4498,20 +4677,25 @@ msgstr "دوائر هذا المجلس" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "عثرنا على أكثر من مطابقة لهذا الموقع. نحن نعرض ما يصل إلى عشر مطابقات، فالرجاء تجربة بحث آخر إذا لم يظهر الموقع هنا." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "وجدنا اكثر من تطايق لمؤشرات المشكلة:" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "وجدنا اكثر من تطايق لمؤشرات المشكلة:" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "نحتاج إلى بريدك الإلكتروني، يرجى كتابته بالأسفل." -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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؛ ولكن لا توجد لدينا أي تفاصيل اتصال لهم. إذا كنت تعرف عنوان اتصال مناسبًا، فالرجاء التواصل معنا." @@ -4519,6 +4703,12 @@ msgstr "نعتقد أن هذه المشكلة هي المسؤولة عن %s؛ و msgid "We send it to the council on your behalf" msgstr "نحن نرسل ذلك إلى المجلس نيابةً عنك" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4528,8 +4718,8 @@ msgstr "لن نستخدم معلوماتك الشخصية إلا وفقًا MaPit." msgstr "مع عمليات البحث عن الطلبات، يمكن أيضًا البحث عن agency_responsible لقصر الطلبات على تلك المرسلة إلى إدارة واحدة. مصطلح البحث هو معرف الإدارة المقدم بواسطة MaPit." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "هل تريد المساهمة في FixMyStreet؟ التعليمات البرمجية الخاصة بنا مفتوحة المصدر ومتاحة على fixmystreet.org." @@ -4596,16 +4790,7 @@ msgstr "كتابة الرسالة بالأحرف الكبيرة يجعل قرا msgid "Wrong location? Just click again on the map." msgstr "موقع غير صحيح؟ انقر مرة أخرى على الخريطة." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "السنة" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4620,7 +4805,7 @@ msgstr "السنة" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "نعم" @@ -4633,7 +4818,7 @@ msgstr "نعم لدي كلمة المرور" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "أنت تشتكي من أن تقرير هذه المشكلة تم تعديله بواسطة الإشراف دون ضرورة لذلك:" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4650,7 +4835,7 @@ msgstr "أنت تبلغ عن التحديث التالي بأنه يشتمل ع msgid "You can view the problem on this site." msgstr "يمكنك عرض المشكلة على هذا الموقع." -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "يمكنك إضافة البريد الإلكتروني الخاصة بالمستخدم المسيء إلى قائمة المسيئين، وهي تخفي تلقائيًا (ولا ترسل مطلقًا) التقارير التي يقومون بإنشائها." @@ -4679,7 +4864,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "يمكنك وضع علامة الحذف على هيئة إذا كنت لا تريدها نشطة على الموقع." @@ -4687,7 +4872,7 @@ msgstr "يمكنك وضع علامة الحذف على هيئة إذا كنت ل msgid "You declined; please fill in the box above" msgstr "لقد رفضت؛ الرجاء تعبئة المربع بالأعلى" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4714,18 +4899,38 @@ msgstr "لقد قمت بتسجيل الخروج" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "لقد حددت موقع المشكلة في النقطة المميزة بدبوس أخضر على الخريطة. إذا لم يكن هذا هو الموقع الصحيح، فانقر على الخريطة مرة أخرى." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "لقد قمت بتأكيد عنوان البريد الإلكتروني بنجاح." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "لقد قمت بتأكيد عنوان البريد الإلكتروني بنجاح." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "لقد قمت بتأكيد عنوان البريد الإلكتروني بنجاح." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "لقد قمت بتأكيد عنوان البريد الإلكتروني بنجاح." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "لقد قمت بتسجيل الدخول بنجاح؛ الرجاء التحقق من بياناتك وتأكيد أنها دقيقة:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "لقد قمت بتأكيد عنوان البريد الإلكتروني بنجاح." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "لم تقم بإنشاء أي تقارير حتى الآن. أبلغ عن مشكلة الآن." @@ -4752,36 +4957,43 @@ msgid "Your Reports" msgstr "التقارير" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "حسابك" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "البريد الإلكتروني" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "عنوان البريد الإلكتروني" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +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 "لن يتم استخدام معلوماتك إلا وفقًا لسياسة الخصوصية الخاصة بنا" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4792,19 +5004,19 @@ msgstr "الاسم" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4815,8 +5027,8 @@ msgstr "كلمة المرور" msgid "Your password has been changed" msgstr "تم تغيير كلمة المرور" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "رقم الهاتف" @@ -4825,7 +5037,7 @@ msgstr "رقم الهاتف" msgid "Your report" msgstr "تقريرك" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "التقارير" @@ -4834,25 +5046,40 @@ msgstr "التقارير" msgid "Your shortlist" msgstr "قائمتك القصيرة" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "تم تغيير كلمة المرور" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "التحديثات" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "نفسك" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "الكل" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4869,8 +5096,8 @@ msgstr "المجلس" msgid "didn't use map" msgstr "لم يتم استخدام الخريطة" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "على سبيل المثال، ’%s‘ أو ’%s‘" @@ -4893,23 +5120,24 @@ msgstr "آخر تحديث %s" msgid "less than a minute" msgstr "أقل من دقيقة واحدة" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "غير متاح" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "بلا" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "عليه علامة ليست مسؤولية المجلس" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "أو تحديد الموقع تلقائيًا" @@ -4950,7 +5178,7 @@ msgstr "لا يوجد دبوس مما يعني أن المستخدم لم يست msgid "this location" msgstr "عرض موقع" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "هذا النوع من المشكلة المحلية" @@ -4958,11 +5186,11 @@ msgstr "هذا النوع من المشكلة المحلية" msgid "today" msgstr "اليوم" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4970,14 +5198,24 @@ msgstr "" msgid "used map" msgstr "تم استخدام الخريطة" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "المستخدم من نفس المجلس مثل المشكلة - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "المستخدم هو صاحب المشكلة" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "البريد موجودا سابقا في لائحة المسيئين" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "حذف من القائمة القصيرة" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5071,7 +5309,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -5082,7 +5320,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" @@ -5093,7 +5331,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" @@ -5104,7 +5342,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -5115,7 +5353,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5225,6 +5463,45 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(البريد في لائحة المسيئين)" + +#~ msgid "By Date" +#~ msgstr "بالتاريخ" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "اضغط هنا أو ادخل كـ يوم\\شهر\\سنة" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "البلاغات المؤكدة بين %s و %s" + +#~ msgid "Hide old" +#~ msgstr "أخفي القديم" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "تضمين التقارير غير المؤكدة" + +#~ msgid "Invalid end date" +#~ msgstr "تاريخ نهاية غير صالح" + +#~ msgid "Invalid start date" +#~ msgstr "تاريخ البداية غير صالح" + +#~ msgid "No council" +#~ msgstr "لا مجلس" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "لاحظ أنه عند تضمين التقارير غير المؤكدة فإننا نستخدم تاريخ إنشاء التقرير والذي قد لا يكون في نفس شهر تأكيد التقرير، لذلك قد تتغير الأرقام قليلاً." + +#~ msgid "Show old" +#~ msgstr "إظهار القديم" + +#~ msgid "Unfixed reports" +#~ msgstr "التقارير التي لم يتم إصلاحها" + +#~ msgid "Year" +#~ msgstr "السنة" + #~ msgid "" #~ "%s sends different categories of problem\n" #~ "to the appropriate council, so problems within the boundary of a particular council\n" diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po index 58de2b98eb5..3ecf692ccbc 100644 --- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/mysociety/teams/12067/bg_BG/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "и" @@ -32,6 +32,10 @@ msgstr "и" msgid " or " msgstr "или" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d редиктарано от %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s връзка с общината – %s потвърдени, %s непотвърдени" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s обновяване в реално време" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s изпратени анкети – %s отговорени (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s изпратени анкети – %s отговорени (%s%% msgid "%s ref: %s" msgstr "%s номер: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Имейлът е маркиран като подаващ обидни сигнали)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(като графити, дупки по улицата, счупено улично осветление)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -161,8 +165,8 @@ msgstr "(изпратен към двата района)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS абонамент за проблеми в %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Изберете категория --" @@ -175,14 +179,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -191,16 +187,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -209,33 +205,52 @@ msgstr "" msgid "%s live problems" msgstr "%s отворени сигнали" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Не Нека потвърдя сигнала чрез имейл" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Не Нека потвърдя сигнала чрез имейл" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Не Нека потвърдя актуализацията чрез имейл" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Не Нека потвърдя актуализацията чрез имейл" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Не Нека да вляза в системата чрез имейл" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Не Нека да вляза в системата чрез имейл" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Да Имам парола" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -252,11 +267,17 @@ msgid "Add a contact using the form below." msgstr "Добавете контакт като използвате формата по-долу." #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Добавете район" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Забрана на имейл адреса" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -279,11 +300,17 @@ msgstr "Добавяне на нова категория" msgid "Add option" msgstr "(незадължително)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -293,23 +320,23 @@ msgstr "" msgid "Add user" msgstr "Добавете потребител" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Добавено %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -333,9 +360,10 @@ msgstr "Известието %d е изключено (създадено на % msgid "Alert me to future updates" msgstr "Известявай ме за бъдещи актуализиации" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -344,12 +372,13 @@ msgstr "" msgid "All Reports" msgstr "Вички сигнали" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -365,17 +394,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Всички сигнали" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Всички сигнали между%s и %s " -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -413,7 +442,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -424,7 +454,7 @@ msgstr "" msgid "Area covered" msgstr "Територията е обхваната" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -438,7 +468,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Прехвърляне към друга категория:" @@ -450,7 +480,7 @@ msgstr "Прехвърляне към външна община:" msgid "Assign to subdivision:" msgstr "Прехвърляне към подразделение:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -466,12 +496,17 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "За момета можете само да търсите и преглеждате сигнали" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Публичен отговор:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -479,18 +514,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -504,20 +531,21 @@ msgstr "Очакващ преглед" msgid "Back" msgstr "Назад" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Забрана на имейл адреса" +#, fuzzy +msgid "Ban user" +msgstr "Означаване на потребител" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Райони" @@ -528,14 +556,10 @@ msgstr "Райони" msgid "Body" msgstr "Район" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Район:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "По дата" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -548,8 +572,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Не виждате картата? Пропуснете тази стъпка" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -560,30 +585,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Категория" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Категория" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "Сигнали подадени преди повече от 4 седмици" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -591,17 +622,17 @@ msgstr "Сигнали подадени преди повече от 4 седм msgid "Category:" msgstr "Категория:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Категория: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -609,10 +640,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Промяна на парола" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "Телефонен номер" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -639,19 +676,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Изберете дата или я въведете - dd/mm/yyyy" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Щракнете върху картата, за да съобщите за проблем" @@ -679,18 +711,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Затворен" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Затворен от общината" @@ -705,16 +738,17 @@ msgid "Cobrand" msgstr "Местна имплементция" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Информация за местната имплементция:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Местна имплементция" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -722,7 +756,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфигурация" @@ -731,7 +765,7 @@ msgstr "Конфигурация" msgid "Confirm" msgstr "Потвърждаване" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Потвърждаване на акаунта" @@ -750,14 +784,10 @@ msgstr "Потвърждение" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Потвърдено" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Потвърдени сигнали между %s и %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -784,8 +814,8 @@ msgstr "Връзка с тима" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Потребителят не е намерен" @@ -803,43 +833,16 @@ msgstr "Община" msgid "Council contacts for %s" msgstr "Контакти на общината за %s " -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "входящ номер в общината: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Община:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Брой" @@ -861,39 +864,44 @@ msgstr "Създай категория" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Създаден" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Създадени:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Текущо състояние" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -904,14 +912,14 @@ msgstr "В момента няма създадени Райони." msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Табло" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -923,12 +931,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -939,8 +947,8 @@ msgstr "" msgid "Deleted" msgstr "Изтрит" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -956,6 +964,10 @@ msgstr "Описание" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -968,6 +980,10 @@ msgstr "Информация" msgid "Details:" msgstr "Информация:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Прехвърлен" @@ -981,8 +997,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "Таблица с районите в София" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -991,7 +1007,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -999,7 +1015,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1019,11 +1035,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1047,9 +1063,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Редактиране" @@ -1059,33 +1076,33 @@ msgstr "Редактиране" msgid "Edit body details" msgstr "Редактиране на информацията за района" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Редактиране на сигнала %d " @@ -1106,7 +1123,6 @@ msgstr "Редактирано от" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1114,17 +1130,20 @@ msgstr "Редактирано от" msgid "Email" msgstr "Имейл" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Имейлът е добавен в списъка със злоупотреби" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Парола (незадължително)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1133,19 +1152,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Имейлът е в списъка със злоупотреби" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Имейл:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Имейл: %s" @@ -1158,16 +1176,17 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Крайна дата:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1188,14 +1207,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Въведете пощенски код или име на улица в близост до вас" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Въведете име на улица в близост до вас" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Въведете парола" @@ -1213,8 +1232,8 @@ msgstr "Въведете информация за проблема" msgid "Error" msgstr "Грешка" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1239,7 +1258,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1255,7 +1274,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1267,7 +1286,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1279,7 +1298,7 @@ msgstr "Допълнителни данни:" msgid "Extra data:" msgstr "Допълнителни данни:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1309,21 +1328,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Поправено" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Поправени - община" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Поправени - потребител" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Означен като \"изтрит\"" @@ -1331,7 +1351,7 @@ msgstr "Означен като \"изтрит\"" msgid "Flag user" msgstr "Означаване на потребител" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Означен" @@ -1340,7 +1360,7 @@ msgstr "Означен" msgid "Flagged reports and users" msgstr "Означени сигнали и потребители" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Означените потребители са изброени на страницата с означените." @@ -1348,8 +1368,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Означен:" @@ -1369,7 +1389,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "За повече информацич вижте Как ПоправиСофия използва MapIt." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1389,8 +1409,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Често задавани въпроси" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1423,12 +1447,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Търси" @@ -1436,7 +1460,7 @@ msgstr "Търси" msgid "Going to send questionnaire?" msgstr "Ще изпратите ли анкетата?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1444,6 +1468,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Графика на създадените сигнали по статус във времето" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "от %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Този проблем поправен ли е?" @@ -1466,21 +1499,26 @@ msgstr "Помощ" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Снимки на скоро подадени сигнали" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Здравей %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Скрити" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1501,21 +1539,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Скрий старите" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Скрий кабърчетата" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1527,7 +1562,7 @@ msgstr "" msgid "History" msgstr "История" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Начало" @@ -1584,12 +1619,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1598,7 +1641,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1607,7 +1650,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1679,11 +1722,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Включи непотвърдените сигнали" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1695,7 +1734,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1707,26 +1746,18 @@ msgstr "Вътрешни бележки" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Невярна дата" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Невярна дата" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "Моля проверете страницата с често задавани въпроси и вижте дали няма да намерите отговор там." @@ -1745,7 +1776,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1770,12 +1801,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1801,18 +1827,14 @@ msgstr "Последно обновено:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1821,13 +1843,13 @@ msgstr "" msgid "List all reported problems" msgstr "Показване на всички сигнали" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Зареждане..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1859,12 +1881,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1872,11 +1897,11 @@ msgstr "" msgid "MAP" msgstr "Карта" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1888,11 +1913,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Маркирайте потребители, които бихте искали да държите под око." -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1912,45 +1937,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Липсващо jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Месец" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1968,9 +1993,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1981,19 +2006,23 @@ msgstr "Име" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Име:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Име: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2003,12 +2032,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2022,19 +2051,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Районът е добавен" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Категорията е добавена" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2055,6 +2088,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "Телефонен номер" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2084,18 +2122,19 @@ msgstr "" msgid "New reports" msgstr "Нови сигнали" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Ново състояние" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2103,7 +2142,7 @@ msgstr "" msgid "Next" msgstr "Слеващ" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2115,22 +2154,18 @@ msgstr "Слеващ" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Не" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Несъществуващ район" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Несъществуваща община" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Не е избрана община" @@ -2160,6 +2195,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Няма намерени резултати" @@ -2182,15 +2221,15 @@ msgstr "" msgid "None" msgstr "" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2209,7 +2248,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Не съм подавал преди" @@ -2223,10 +2262,6 @@ msgstr "Съгналът не е подаден към общината" msgid "Note" msgstr "Бележка" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2254,37 +2289,46 @@ msgstr "Сега да изпратим Вашия сигнал…" msgid "Now to submit your update…" msgstr "Изпратете актуализацията…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "ОК" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Стар статус" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2323,23 +2367,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Други" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "други територии:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2357,19 +2408,19 @@ msgstr "Страницата не е намерена" msgid "Parent" msgstr "Община" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Частичен" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Парола (незадължително)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Парола:" @@ -2377,7 +2428,7 @@ msgstr "Парола:" msgid "Permalink" msgstr "Връзка" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2385,19 +2436,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Телефонен номер" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Телефонен номер (незадължително)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Телефон:" @@ -2413,7 +2469,7 @@ msgstr "Телефон:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2439,12 +2495,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Снимки на скоро подадени сигнали" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Поставете кабърче върху картата" @@ -2466,25 +2527,34 @@ msgstr "Моля бъдете учтиви, кратки и се придърж msgid "Please check the passwords and try again" msgstr "Моля проверете паролите и пробвайте отново" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Моля проверете дали сте въвели коректен имейл адрес" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Моля проверете дали сте въвели коректен имейл адрес" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Моля изберете категория" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2499,39 +2569,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Моля не обиждайте никого - обиждайки Общината, Вие обезценявате услугата за всички потребители." -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Моля въведете съобщение" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Моля въведете фамилия" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Моля въведете парола" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Моля въведете тема" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Моля въведете валиден имейл" @@ -2540,55 +2618,62 @@ msgstr "Моля въведете валиден имейл" msgid "Please enter a valid email address" msgstr "Моля въведете валиден имейл адрес" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Моля въведете фамилия" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Моля въведете информация" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Моля въведете имейл" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Моля въведете имейл адрес" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Моля въведете име" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Моля въведете име" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Моля въведете фамилия" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Моля въведете фамилия" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Моля въведете обръщение" @@ -2637,7 +2722,12 @@ msgstr "" msgid "Please note:" msgstr "Забележка:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Моля въведете информация защо отваряте сигнала отново." + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2677,6 +2767,11 @@ msgstr "Моля посочете дали проблемът е бил разр msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Моля въведете съобщение" @@ -2686,7 +2781,7 @@ msgid "Please write your update here" msgstr "Моля въведете новото съобщение тук" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Публикувай" @@ -2695,15 +2790,15 @@ msgstr "Публикувай" msgid "Posted anonymously at %s" msgstr "Публикувано от анонимен потребител в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Публикувано от %s в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Публикувано от %s (%s) в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Публикувано от %s в %s" @@ -2715,11 +2810,11 @@ msgstr "" msgid "Previous" msgstr "Предишно" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2736,7 +2831,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Лично" @@ -2760,21 +2855,21 @@ msgstr "Сигналът %s е потвърден" msgid "Problem %s sent to council %s" msgstr "Сигналът %s е подаден към общината %s " -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Разделяне на сигналите по статуси" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Сигналът е маркиран като отворен." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Статусът на сигнала е променен на основата на резултат от анкета" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Сигнали" @@ -2801,7 +2896,7 @@ msgstr "Проблеми сигнализирани скоро в сайта" msgid "Problems within %.1fkm of %s" msgstr "Сигнали в радиус от %.1fкм от това местоположение" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2827,7 +2922,8 @@ msgstr "" msgid "Property address:" msgstr "Адрес на имота:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Въведете иформация за актуализиране" @@ -2836,12 +2932,12 @@ msgstr "Въведете иформация за актуализиране" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Използването на потребителско име е опционално, но това ще ви позволи по-лесно да подавате сигнали и да публикувате информация и актуализации." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Използването на парола е по избор, но това ще ви позволи по-лесно да подавате сигнали и да публикувате и променяте актуализации." @@ -2854,12 +2950,12 @@ msgstr "" msgid "Public response:" msgstr "Публичен отговор:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Публикувай снимка" @@ -2914,7 +3010,7 @@ msgstr "RSS абонамент за %s, в квартал %s" msgid "RSS feed of nearby problems" msgstr "RSS абонамент за последни проблеми наоколо" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2939,7 +3035,7 @@ msgstr "RSS абонамент за актуализации по този пр msgid "Receive email when updates are left on this problem." msgstr "Получаване на имейл при актуализация на проблема." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2953,7 +3049,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Наскоро добавени сигнали" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2977,9 +3073,9 @@ msgstr "Премахване на означението" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2987,12 +3083,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Премахване на снимката (необратимо действие)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3021,11 +3121,11 @@ msgstr "Сигнализирай за неподходящо съдържани msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Сигнал за %s " -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3040,17 +3140,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Сигнализирай, разгледай или коментирай проблеми" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Подавал съм и преди" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "" @@ -3064,27 +3164,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Сигналът е подаден в категория %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно в категория %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Сигналът е подаден в категория %s от %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно чрез %s в категория %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сигналът е подаден чрез %s в категория %s от %s в %s" @@ -3093,8 +3193,8 @@ msgstr "Сигналът е подаден чрез %s в категория %s msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3102,10 +3202,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Сигнализиране за проблем" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Сигнали" @@ -3121,7 +3220,7 @@ msgstr "Сигнали чакащи одобрение" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3133,7 +3232,7 @@ msgstr "" msgid "Reports published" msgstr "Публикувани сигнали" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3188,21 +3287,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3221,17 +3321,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Завъртане наляво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Завъртане надясно" @@ -3241,21 +3341,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3266,12 +3366,12 @@ msgstr "Запази промените" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3290,7 +3390,7 @@ msgstr "Търсене на Сигнали" msgid "Search Users" msgstr "Търсене на Потребители" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Търсене на сигнали" @@ -3301,6 +3401,7 @@ msgid "Search:" msgstr "Търсене:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Не са намерени сигнали." @@ -3313,7 +3414,7 @@ msgstr "Не са намерени потребители." msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3322,8 +3423,8 @@ msgstr "" msgid "Select a body" msgstr "Изберете район" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Изберете територия" @@ -3343,11 +3444,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Сигналът е подаден към %s преди %s" @@ -3356,11 +3462,11 @@ msgid "Sent:" msgstr "Изпратени:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Услуга:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3369,9 +3475,9 @@ msgid "Share" msgstr "Сподели" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3379,19 +3485,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3399,40 +3505,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Показвай името ми публично" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Показване на старите" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Покажи кабърчетата" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3443,12 +3546,16 @@ msgstr "Вход" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Влезте или създайте акаунт" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Изход" @@ -3464,7 +3571,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Някои снимки от сигнали подадени наскоро" @@ -3477,15 +3584,19 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3518,20 +3629,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Начална дата:" #: templates/web/base/admin/body.html:73 @@ -3541,15 +3653,18 @@ msgstr "Начална дата:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Запази промените" @@ -3563,17 +3678,19 @@ msgstr "Запази промените" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Статус" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "" @@ -3583,7 +3700,7 @@ msgstr "" msgid "Status" msgstr "Статус" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Все още отворен, от анкета, %s " @@ -3596,7 +3713,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Категория" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "" @@ -3613,18 +3735,19 @@ msgstr "Тема" msgid "Subject:" msgstr "Тема:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Изпращане" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3666,7 +3789,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3674,25 +3797,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Обобщение" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Обобщена справка" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Обобщена справка" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Резултати от проучване" @@ -3700,14 +3829,14 @@ msgstr "Резултати от проучване" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Текст" @@ -3715,7 +3844,7 @@ msgstr "Текст" msgid "Text only version" msgstr "Версия само с текст" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3742,7 +3871,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Благодаря за предоставената снимка. Тъй като се нуждаем от местоложението на вашия проблем, моля въведете адрес наблизо в полето по-горе :" @@ -3758,7 +3887,7 @@ msgstr "Прикачването на изображение е неуспешн msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "В момента за това местоположение не може да се подаде сигнал; може би все още нямаме потвърждение от общината. Моля опитайте отново по-късно." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3768,11 +3897,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Моля да ни извините, този пощенски код не беше разпознат." -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Сигналът ще бъде препратен." @@ -3804,8 +3933,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3838,8 +3967,8 @@ msgstr "Бихте могли да помогнете на Общината да msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Грешката беше: %s" @@ -3881,7 +4010,7 @@ msgstr "Последни проблеми сигнализирани като п msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3906,7 +4035,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3919,33 +4048,38 @@ msgstr "" "Потребителското име е видимо публично в сигналите, които не са маркирани като анонимни.\n" "Имената не са уникални." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Възникна проблем при визуализирането на страницата с всички сигнали. Моля опитайте по-късно." #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "Възникна проблем при визуализирането на страницата. Моля пробвайте по-късно." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Възникна проблем с комбинацията имейл/парола. Ако не можете да си спомните паролата или нямате такава, моля попълнете секцията ‘влизане чрез имейл’." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Възникна проблем с комбинацията имейл/парола. Моля опитайте отново." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Възникна проблем с комбинацията имейл/парола. Ако не можете да си спомните паролата или нямате такава, моля попълнете секцията ‘влизане чрез имейл’." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Възникна проблем с вашата актуализация. Моля опитайте отново." @@ -3953,7 +4087,7 @@ msgstr "Възникна проблем с вашата актуализация msgid "There were problems with your report. Please see below." msgstr "Възникна проблем с вашая сигнал. Моля опитайте отново." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Възникнаха проблеми с вашата актуализация. Моля вижте по-долу." @@ -4008,26 +4142,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Тази информация е необходима" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4044,7 +4186,7 @@ msgstr "Този проблем не е решен." msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4054,23 +4196,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Този сигнал е означен със статус затворен." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Този сигнал е означен със статус поправен." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Този сигнал е означен със статус отворен." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Тази страница съдържа и снимка, изпратена от нашия потребител." @@ -4081,7 +4223,7 @@ msgstr "Тази страница съдържа и снимка, изпрате msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Времева линия" @@ -4093,20 +4235,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Заглавие" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "За да получите нови известия, моля въведете пощенски код или име на улица." @@ -4118,44 +4261,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "За да видите точното местоположение на проблема върху картата" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Общо" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Общо" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4168,18 +4303,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Опитайте отново" @@ -4194,7 +4330,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4203,15 +4343,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Непотвърден" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Неизвестен" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -4221,13 +4357,14 @@ msgstr "" msgid "Unknown error" msgstr "Непозната грешка" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4252,12 +4389,12 @@ msgstr "Актуализирано анонимно на %s" msgid "Update below added by %s at %s" msgstr "Актуализирано от %s на %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4265,16 +4402,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "Актуализирано от {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Актуализация на възобновен сигнал" @@ -4288,20 +4425,20 @@ msgstr "Актуализация на статусите" msgid "Updated" msgstr "Актуализирано!" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Публикувано от %s (%s) в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Публикувано от %s в %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4309,7 +4446,7 @@ msgid "Updated!" msgstr "Актуализирано!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Актуализации" @@ -4356,40 +4493,81 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Имейлът е добавен в списъка със злоупотреби" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Имейлът е в списъка със злоупотреби" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "(Имейлът е маркиран като подаващ обидни сигнали)" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Потребители" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Потребители" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Актуализиране на стойностите" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Имейл адрес" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Телефонен номер" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4411,12 +4589,7 @@ msgstr "Преглед на местоположение" msgid "Viewing a problem" msgstr "Преглед на сигнал" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4426,20 +4599,24 @@ msgstr "" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Намерихме повече от едно съвпадение за Вашето местонахождение. Показват се до 10 съвпадения, моля опитайте търсене по друг критерий, ако вашето местоположение, не е сред показаните." +msgid "We found more than one match for that location." +msgstr "" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "" @@ -4447,6 +4624,12 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "Ние ще го изпратим на общината вместо Вас" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Намерихме повече от едно съвпадение за Вашето местонахождение. Показват се до 10 съвпадения, моля опитайте търсене по друг критерий, ако вашето местоположение, не е сред показаните." + #: 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." @@ -4456,8 +4639,8 @@ msgstr "Личните Ви данни ще бъдат използвани ед msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4485,7 +4668,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4508,6 +4691,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4524,16 +4711,7 @@ msgstr "Моля пишете на кирилица! Писането само msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Година" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4548,7 +4726,7 @@ msgstr "Година" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Да" @@ -4561,7 +4739,7 @@ msgstr "Да, имам парола" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4578,7 +4756,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Можете да разгледате сигнала на този сайт." -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4604,7 +4782,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Можете да маркирате района или общината за изтриване, ако не желаете да бъде активна за този сайт." @@ -4612,7 +4790,7 @@ msgstr "Можете да маркирате района или общинат msgid "You declined; please fill in the box above" msgstr "Вие отказахте; моля попълнете полето по-долу." -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4639,18 +4817,38 @@ msgstr "Вие излязохте успешно" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Сигналът е локализиран на местоположението отбелязано със зеленото кабърче върху картата. Ако това не е правилното местоположение, моля щракнете отново върху картата и изберете точната локация." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Успешно пoтвърдихте Вашият имейл адрес." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Успешно пoтвърдихте Вашият имейл адрес." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Успешно пoтвърдихте Вашият имейл адрес." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Успешно пoтвърдихте Вашият имейл адрес." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Успешно влязохте в системата; моля проверете и потвърдете коректността на данните си:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Успешно пoтвърдихте Вашият имейл адрес." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Все още нямате подадени сигнали. Подайте сигнал." @@ -4677,36 +4875,43 @@ msgid "Your Reports" msgstr "Вашите Сигнали" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Имейл" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Имейл адрес" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +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 "Вашата информация ще бъде използва само спрямо нашата Политика за поверителност" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4717,19 +4922,19 @@ msgstr "Име" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4740,8 +4945,8 @@ msgstr "Парола" msgid "Your password has been changed" msgstr "Паролата Ви беше променена успешно" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Телефонен номер" @@ -4750,7 +4955,7 @@ msgstr "Телефонен номер" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Вашите сигнали" @@ -4759,25 +4964,40 @@ msgstr "Вашите сигнали" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Паролата Ви беше променена успешно" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Актуализации" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4794,8 +5014,8 @@ msgstr "община" msgid "didn't use map" msgstr "картата не е била използвана" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "напр. ‘%s’ или ‘%s’" @@ -4818,23 +5038,24 @@ msgstr "Последно обновено %s" msgid "less than a minute" msgstr "преди по-малко от минута" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "няма информация" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "маркиран като \"незадължение на Общината\"" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "или ме намери автоматично" @@ -4875,7 +5096,7 @@ msgstr "мястото не е било отбелязано на картата msgid "this location" msgstr "Преглед на местоположение" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "този тип сигнали" @@ -4883,11 +5104,11 @@ msgstr "този тип сигнали" msgid "today" msgstr "днес" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4895,14 +5116,24 @@ msgstr "" msgid "used map" msgstr "използвана е била картата" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "потребителят е от същата община като проблема - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "потребителят е собственик на сигнала" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Имейлът е в списъка със злоупотреби" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Имейлът е добавен в списъка със злоупотреби" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4964,35 +5195,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5062,6 +5293,36 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "By Date" +#~ msgstr "По дата" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Изберете дата или я въведете - dd/mm/yyyy" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Потвърдени сигнали между %s и %s" + +#~ msgid "Hide old" +#~ msgstr "Скрий старите" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Включи непотвърдените сигнали" + +#~ msgid "Invalid end date" +#~ msgstr "Невярна дата" + +#~ msgid "Invalid start date" +#~ msgstr "Невярна дата" + +#~ msgid "No council" +#~ msgstr "Несъществуваща община" + +#~ msgid "Show old" +#~ msgstr "Показване на старите" + +#~ msgid "Year" +#~ msgstr "Година" + #~ msgid "%s ward, %s" #~ msgstr "%s квартал, %s" diff --git a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po index 2ab7b05f2e0..f6cbb95ed2f 100644 --- a/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ca_ES.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Josep Lluís - LliureTIC , 2017\n" "Language-Team: Catalan (Spain) (https://www.transifex.com/mysociety/teams/12067/ca_ES/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "i" @@ -32,6 +32,10 @@ msgstr "i" msgid " or " msgstr "o" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d modificacions per %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" @@ -91,7 +100,7 @@ msgstr "" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Email en taula d'abús)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -138,7 +142,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -159,8 +163,8 @@ msgstr "(enviat als dos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Tria una categoria --" @@ -173,14 +177,6 @@ msgstr "--Escull una plantilla--" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "Fa 14-30 dies" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "Fa 7-14 dies" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -189,16 +185,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "%s desat." @@ -207,33 +203,49 @@ msgstr "%s desat." msgid "%s live problems" msgstr "%s problemes actuals" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my report by email/text" +msgstr "" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my update by email/text" +msgstr "" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +msgid "No let me sign in by email or text" +msgstr "" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Sí Tinc contrasenya" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -247,11 +259,17 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Afegeix el cos" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Nova adreça de correu electrònic:" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -274,11 +292,17 @@ msgstr "Afegeix una nova categoria" msgid "Add option" msgstr "opcional" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(sense número de telèfon)" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -288,23 +312,23 @@ msgstr "" msgid "Add user" msgstr "Afegeix un usuari" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "Afegeix/edita categories de problemes" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "Afegeix/edita prioritats de resposta" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "Afegeix/edita plantilles de resposta" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Afegit %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -328,9 +352,10 @@ msgstr "" msgid "Alert me to future updates" msgstr "Avisa'm de futures actualitzacions" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "Tot" @@ -339,12 +364,13 @@ msgstr "Tot" msgid "All Reports" msgstr "Tots els informes" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Tots els informes en CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Totes les categories" @@ -360,17 +386,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Tots els informes" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Tots els informes entre %s i %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -408,7 +434,8 @@ 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:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Estàs segur?" @@ -419,7 +446,7 @@ msgstr "Estàs segur?" msgid "Area covered" msgstr "Àrea coberta" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "Àrea:" @@ -433,7 +460,7 @@ msgid "Assign to competent body:" msgstr "Assigna a un cos competent:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Assigna a una categoria diferent:" @@ -445,7 +472,7 @@ msgstr "Assigna a un cos extern:" msgid "Assign to subdivision:" msgstr "Assigna a subdivisió:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "Assigna usuaris a àreas" @@ -461,12 +488,17 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Resposta automática:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "Resposta automática:" @@ -474,18 +506,10 @@ msgstr "Resposta automática:" msgid "Available categories" msgstr "Categories disponibles" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -499,20 +523,21 @@ msgstr "Esperant moderació" msgid "Back" msgstr "Torna" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "Torna a tots els informes" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "" +#, fuzzy +msgid "Ban user" +msgstr "Marca l'usuari" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Cossos" @@ -523,14 +548,10 @@ msgstr "Cossos" msgid "Body" msgstr "Cos" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Cos:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Per data" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -543,8 +564,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "No pots veure el mapa? Salta aquest pas" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Categories" @@ -555,30 +577,36 @@ msgstr "Categories:" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Categoria" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Categoria" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categoria canviada de ‘%s’ a ‘%s’" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -586,17 +614,18 @@ msgstr "" msgid "Category:" msgstr "Categoria:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Categoria: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "Canvia el correu electrònic" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "Canvia l'adreça de correu electrònic" @@ -604,10 +633,16 @@ msgstr "Canvia l'adreça de correu electrònic" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Canvia la contrasenya" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(sense número de telèfon)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -629,19 +664,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "Escull un altre" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "Neteja les dades fora de línia" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Fes clic aqui o entra-ho com dd/mm/yyyy" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Fes clic al mapa per registrar un problema" @@ -670,18 +700,19 @@ msgstr "Fes clic a l'enllaç del nostre correu electrònic de confirmació per e #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Tancat" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "" @@ -696,16 +727,17 @@ msgid "Cobrand" msgstr "" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -713,7 +745,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuració" @@ -722,7 +754,7 @@ msgstr "Configuració" msgid "Confirm" msgstr "Confirma" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Confirma el compte" @@ -741,14 +773,10 @@ msgstr "Confirmació" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Confirmat" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -775,8 +803,8 @@ msgstr "Contacta a l'equip" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "" @@ -794,43 +822,16 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "" @@ -852,39 +853,44 @@ msgstr "Crea una categoria" msgid "Create priority" msgstr "Crea una prioritat" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Crea una plantilla" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Creat" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Creat:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Estat actual" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -895,14 +901,14 @@ msgstr "" msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -915,12 +921,12 @@ msgstr "" msgid "Default priority" msgstr "Crea una prioritat" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Elimina plantilla" @@ -931,8 +937,8 @@ msgstr "Elimina plantilla" msgid "Deleted" msgstr "Eliminat" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -948,6 +954,10 @@ msgstr "Descripció" msgid "Description:" msgstr "Descripció:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -960,6 +970,10 @@ msgstr "Detalls" msgid "Details:" msgstr "Detalls:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "" @@ -973,8 +987,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -983,7 +997,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -991,7 +1005,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "Tens contrasenya de %s?" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1011,11 +1025,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "Duplicat de" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "Duplicats" @@ -1035,9 +1049,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Edita" @@ -1047,33 +1062,33 @@ msgstr "Edita" msgid "Edit body details" msgstr "Edita els detalls del cos" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "Edita la categoria d'informes" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "Edita la prioritat d'informes" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "Edita els informes" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Editant el problema %d" @@ -1094,7 +1109,6 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1102,17 +1116,20 @@ msgstr "Editor" msgid "Email" msgstr "Correu electrònic" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Correu electrònic afegit a la llista d'abús" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "Adreça de correu electrònic" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Adreça de correu electrònic" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Alerta de correu electrònic creada" @@ -1121,19 +1138,18 @@ msgstr "Alerta de correu electrònic creada" msgid "Email alert deleted" msgstr "Alerta de correu electrònic eliminada" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "El correu electrònic ja existeix a la llista d'abús" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Correu electrònic:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Correu electrònic: %s" @@ -1146,17 +1162,18 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" -msgstr "" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" +msgstr "Per data" #: templates/web/base/admin/open311-form-fields.html:21 msgid "Endpoint" @@ -1176,14 +1193,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Entra una contrasenya" @@ -1201,8 +1218,8 @@ msgstr "Entra els detalls del problema" msgid "Error" msgstr "Error" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Tot" @@ -1227,7 +1244,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "Exporta com a CSV" @@ -1243,7 +1260,7 @@ msgstr "Extern" msgid "External ID" msgstr "ID extern" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "URL externa" @@ -1255,7 +1272,7 @@ msgstr "Cos extern" msgid "External team" msgstr "Equip extern" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1267,7 +1284,7 @@ msgstr "Detalls extres" msgid "Extra data:" msgstr "Data extra:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "Detalls extres" @@ -1297,21 +1314,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Corregit" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Marca com esborrat" @@ -1319,7 +1337,7 @@ msgstr "Marca com esborrat" msgid "Flag user" msgstr "Marca l'usuari" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Marcat" @@ -1328,7 +1346,7 @@ msgstr "Marcat" msgid "Flagged reports and users" msgstr "Informes i usuaris marcats" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1336,8 +1354,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Marcat:" @@ -1357,7 +1375,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1377,8 +1395,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Preguntes mes freqüents (FAQ)" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1411,12 +1433,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Ves" @@ -1424,7 +1446,7 @@ msgstr "Ves" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1432,6 +1454,14 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" +#: templates/web/base/dashboard/index.html:93 +msgid "Group by %s" +msgstr "" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "S'ha corregit aquest problema?" @@ -1452,21 +1482,25 @@ msgstr "Ajuda" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +msgid "Here are some other nearby reports:" +msgstr "" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hola %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Ocultat" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "Oculta l'informe complet" @@ -1487,21 +1521,18 @@ 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:67 -msgid "Hide old" -msgstr "" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "Oculta l'actualització completament?" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "Oculta el teu nom?" @@ -1513,7 +1544,7 @@ msgstr "" msgid "History" msgstr "" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Inici" @@ -1570,12 +1601,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1584,7 +1623,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1593,7 +1632,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1665,11 +1704,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1681,7 +1716,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1693,26 +1728,18 @@ msgstr "Notes internes" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Data final invàlida" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Data d'inici invàlida" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1731,7 +1758,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1756,12 +1783,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "Últimes 4 setmanes" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "Últims 7 dies" @@ -1787,18 +1809,14 @@ msgstr "Última actualització:" msgid "Latitude/Longitude:" msgstr "Latitut/Longitut:" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1807,13 +1825,13 @@ msgstr "" msgid "List all reported problems" msgstr "Llista tots els problemes informats" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Carregant..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1845,12 +1863,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1858,11 +1879,11 @@ msgstr "" msgid "MAP" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1874,11 +1895,11 @@ msgstr "Mapa" msgid "Mark as sent" msgstr "Marca com enviat" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1898,45 +1919,45 @@ msgstr "Missatge al cos extern:" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "Modera" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "Modera detalls de l'informe" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "Modera aquest informe" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "Modera aquesta actualització" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "Moderat per %s a %s" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "Raó de moderació:" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Mes" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "Més comentat" @@ -1954,9 +1975,9 @@ msgstr "Més comentat" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1967,19 +1988,24 @@ msgstr "Nom" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Nom:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Nom: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "Navega a aquest problema" +#: templates/web/base/report/_inspect.html:39 +#, fuzzy +msgid "Nearest calculated address:" +msgstr "Nova adreça de correu electrònic:" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1989,12 +2015,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2008,20 +2034,24 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 #, fuzzy msgid "New" msgstr "El més nou" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Nou cos afegit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Nova categoria de contacte afegida" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "Nova adreça de correu electrònic:" @@ -2042,6 +2072,11 @@ msgstr "" msgid "New password:" msgstr "Nova contrasenya:" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(sense número de telèfon)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2071,18 +2106,19 @@ msgstr "" msgid "New reports" msgstr "Nous informes" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "El més nou" @@ -2090,7 +2126,7 @@ msgstr "El més nou" msgid "Next" msgstr "Següent" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2102,22 +2138,18 @@ msgstr "Següent" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "No" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Sense àrea" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Sense cos" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "" @@ -2147,6 +2179,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "No s'han retornat resultats" @@ -2169,15 +2205,15 @@ msgstr "Sense seguidors" msgid "None" msgstr "Cap" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2196,7 +2232,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "" @@ -2210,10 +2246,6 @@ msgstr "" msgid "Note" msgstr "" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2241,37 +2273,46 @@ msgstr "" msgid "Now to submit your update…" msgstr "" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2311,23 +2352,29 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +msgid "Other wards" +msgstr "" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2345,19 +2392,19 @@ msgstr "" msgid "Parent" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "" @@ -2365,7 +2412,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2373,19 +2420,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "" @@ -2401,7 +2453,7 @@ msgstr "" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2427,12 +2479,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "" @@ -2454,25 +2511,33 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: 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:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2487,39 +2552,46 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: 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:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "" @@ -2528,55 +2600,61 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +msgid "Please enter a valid email or phone number" +msgstr "" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "" @@ -2625,7 +2703,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +msgid "Please provide a duplicate ID or public update for this report." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2665,6 +2747,11 @@ msgstr "" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "" @@ -2674,7 +2761,7 @@ msgid "Please write your update here" msgstr "" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2683,15 +2770,15 @@ msgstr "" msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "" @@ -2703,11 +2790,11 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2724,7 +2811,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "" @@ -2748,21 +2835,21 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -2787,7 +2874,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2812,7 +2899,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" @@ -2821,12 +2909,12 @@ msgstr "" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2839,12 +2927,12 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "" @@ -2899,7 +2987,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2924,7 +3012,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2938,7 +3026,7 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2960,9 +3048,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2970,12 +3058,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3004,11 +3096,11 @@ msgstr "" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3023,17 +3115,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "" @@ -3047,27 +3139,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3076,8 +3168,8 @@ msgstr "" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3085,10 +3177,9 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "" @@ -3104,7 +3195,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3116,7 +3207,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3169,21 +3260,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3202,17 +3294,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -3222,21 +3314,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3247,12 +3339,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3271,7 +3363,7 @@ msgstr "" msgid "Search Users" msgstr "" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "" @@ -3282,6 +3374,7 @@ msgid "Search:" msgstr "" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3294,7 +3387,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3303,8 +3396,8 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "" @@ -3324,11 +3417,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "" @@ -3337,11 +3435,11 @@ msgid "Sent:" msgstr "" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3350,9 +3448,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3360,19 +3458,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3380,40 +3478,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3424,12 +3519,16 @@ msgstr "" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -3445,7 +3544,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "" @@ -3458,15 +3557,19 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3499,20 +3602,20 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +msgid "Start Date" msgstr "" #: templates/web/base/admin/body.html:73 @@ -3522,15 +3625,18 @@ msgstr "" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 msgid "State changed to:" msgstr "" @@ -3543,16 +3649,18 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "" @@ -3562,7 +3670,7 @@ msgstr "" msgid "Status" msgstr "" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "" @@ -3575,7 +3683,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Categoria" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "" @@ -3592,18 +3705,19 @@ msgstr "" msgid "Subject:" msgstr "" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3644,7 +3758,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3652,25 +3766,30 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +msgid "Summary statistics" +msgstr "" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -3678,14 +3797,14 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -3693,7 +3812,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3720,7 +3839,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" @@ -3736,7 +3855,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3746,11 +3865,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "" @@ -3782,8 +3901,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3816,8 +3935,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "" @@ -3859,7 +3978,7 @@ msgstr "" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3884,7 +4003,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3895,33 +4014,37 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3929,7 +4052,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "" @@ -3984,26 +4107,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4020,7 +4151,7 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4030,23 +4161,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4057,7 +4188,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4069,20 +4200,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" @@ -4094,44 +4226,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4144,18 +4268,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "" @@ -4170,7 +4295,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4179,15 +4308,11 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -4197,13 +4322,14 @@ msgstr "" msgid "Unknown error" msgstr "" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4228,12 +4354,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4241,16 +4367,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -4264,19 +4390,19 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "%s problemes actuals" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4284,7 +4410,7 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" @@ -4331,40 +4457,80 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Correu electrònic afegit a la llista d'abús" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "El correu electrònic ja existeix a la llista d'abús" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "En taula d'abús?" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +msgid "User:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Nova adreça de correu electrònic:" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "(sense número de telèfon)" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4386,12 +4552,7 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4401,20 +4562,24 @@ msgstr "" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." +msgid "We found more than one match for that location." msgstr "" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "" @@ -4422,6 +4587,11 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4431,8 +4601,8 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4460,7 +4630,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4483,6 +4653,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4499,16 +4673,7 @@ msgstr "" msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4523,7 +4688,7 @@ msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "" @@ -4536,7 +4701,7 @@ msgstr "" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4553,7 +4718,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4579,7 +4744,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4587,7 +4752,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4614,18 +4779,34 @@ msgstr "" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +msgid "You have successfully added your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" +#: templates/web/base/auth/change_phone.html:15 +msgid "You have successfully confirmed your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +msgid "You have successfully removed your phone number." +msgstr "" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +msgid "You have successfully verified your phone number." +msgstr "" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4649,36 +4830,42 @@ msgid "Your Reports" msgstr "" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +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 "" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4689,19 +4876,19 @@ msgstr "" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4712,8 +4899,8 @@ msgstr "" msgid "Your password has been changed" msgstr "" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "" @@ -4722,7 +4909,7 @@ msgstr "" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "" @@ -4731,25 +4918,39 @@ msgstr "" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +msgid "Your token has been generated" +msgstr "" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4766,8 +4967,8 @@ msgstr "" msgid "didn't use map" msgstr "" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4790,22 +4991,23 @@ msgstr "" msgid "less than a minute" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "" @@ -4845,7 +5047,7 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4853,11 +5055,11 @@ msgstr "" msgid "today" msgstr "avui" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4865,14 +5067,24 @@ msgstr "" msgid "used map" msgstr "" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "El correu electrònic ja existeix a la llista d'abús" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Correu electrònic afegit a la llista d'abús" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4934,35 +5146,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5032,6 +5244,27 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(Email en taula d'abús)" + +#~ msgid "14-30 days old" +#~ msgstr "Fa 14-30 dies" + +#~ msgid "7-14 days old" +#~ msgstr "Fa 7-14 dies" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Fes clic aqui o entra-ho com dd/mm/yyyy" + +#~ msgid "Invalid end date" +#~ msgstr "Data final invàlida" + +#~ msgid "Invalid start date" +#~ msgstr "Data d'inici invàlida" + +#~ msgid "Last 4 weeks" +#~ msgstr "Últimes 4 setmanes" + #~ msgid "-- Pick a property type --" #~ msgstr "-- Tria un tipus de propietat --" diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po index cfede061449..86e7bda78c0 100644 --- a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Czech (Czech Republic) (https://www.transifex.com/mysociety/teams/12067/cs_CZ/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr " a " @@ -32,6 +32,10 @@ msgstr " a " msgid " or " msgstr " nebo " +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d úprav od %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s úředních kontaktů -%s potvrzených, %s nepotvrzených" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s online aktualizace" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s dotazníky zaslány -%s odpovědělo (%s %%)" @@ -91,7 +100,7 @@ msgstr "%s dotazníky zaslány -%s odpovědělo (%s %%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(E-mailů v tabulce zneužívání)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(např. graffiti, rozbité pouliční osvětlení, díry v komunikacích a pod. )" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -161,8 +165,8 @@ msgstr "(odesláno dvoum??)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS kanál hlášení v oblasti %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Vyberte kategorii --" @@ -175,14 +179,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -194,16 +190,16 @@ msgstr "" " To je pravděpodobně proč je \"area covered\" prázdná (níže).
\n" " Asi upravte MAPIT_TYPES ve vašem konfiguračním souboru." -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -212,33 +208,52 @@ msgstr "" msgid "%s live problems" msgstr "%sNevyřešená hlášení" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Ne Potvrdím hlášení e-mailem" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Ne Potvrdím hlášení e-mailem" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Ne Potvrdím aktualizaci e-mailem" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Ne Potvrdím aktualizaci e-mailem" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Ne přihlásím se pomocí e-mailu" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Ne přihlásím se pomocí e-mailu" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Ano Mám heslo" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -255,11 +270,17 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Zadejte instituci" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Zakázat emailovou adresu" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -282,11 +303,17 @@ msgstr "Přidat novou kategorii" msgid "Add option" msgstr "(volitelně)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "Vaše telefonní číslo:" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -296,23 +323,23 @@ msgstr "" msgid "Add user" msgstr "Přidat Uživatele" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Přidáno %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -336,9 +363,10 @@ msgstr "Upozornění %d zrušeno (vytvořeno %s)" msgid "Alert me to future updates" msgstr "Upozorněte mě na budoucí aktualizace" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -347,12 +375,13 @@ msgstr "" msgid "All Reports" msgstr "Všechna hlášení" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -368,17 +397,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Všechna hlášení" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Všechna hlášení od %s do %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -416,7 +445,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -427,7 +457,7 @@ msgstr "" msgid "Area covered" msgstr "Oblast pokrytí" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -441,7 +471,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Přiřaďte jinou kategorii:" @@ -453,7 +483,7 @@ msgstr "Přiřaďte externí instituci:" msgid "Assign to subdivision:" msgstr "Přiřaďte oddělení:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -469,12 +499,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Nezodpovídá" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -482,18 +517,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -507,20 +534,21 @@ msgstr "Čeká se na moderování" msgid "Back" msgstr "Zpět" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Zakázat emailovou adresu" +#, fuzzy +msgid "Ban user" +msgstr "Sledovat uživatele" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Subjekty" @@ -531,14 +559,10 @@ msgstr "Subjekty" msgid "Body" msgstr "Subjekt" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Subjekt:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Podle datumu" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -551,8 +575,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Nevidíte mapu? vynechte tento krok" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -563,30 +588,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Katetorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Katetorie" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -594,17 +625,17 @@ msgstr "Category fix rate for problems > 4 týdny staré" msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategorie: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -612,10 +643,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Změnit heslo" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "Vaše telefonní číslo:" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -645,19 +682,14 @@ 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Klikněte sem nebo vložte dd/mm/rrrr" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klikněte na mapu a nahlaste problém" @@ -685,18 +717,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Uzavřena" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Uzavřena úřadem" @@ -711,16 +744,17 @@ msgid "Cobrand" msgstr "Motiv" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Data motivu:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Motiv:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -728,7 +762,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Nastavení" @@ -737,7 +771,7 @@ msgstr "Nastavení" msgid "Confirm" msgstr "Potvrdit" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Potvrdit účet" @@ -756,14 +790,10 @@ msgstr "Potvrzení" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Potvrzeno" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Potvrzená hlášení od %s do %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -790,8 +820,8 @@ msgstr "Kontaktujte nás!" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Uživatele nelze najít" @@ -809,43 +839,16 @@ msgstr "Úřad" msgid "Council contacts for %s" msgstr "Kontakty na úřad %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "číslo jednací: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Úřad:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Počet" @@ -867,39 +870,44 @@ msgstr "Vytvořit kategorii" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Vytvořeno" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Vytvořeno:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Aktuální stav" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -910,14 +918,14 @@ msgstr "Doposud nebyl vytvořen žádný subjekt." msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Přehledy" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Odbavované úřadem do 5 pracovních dnů" @@ -929,12 +937,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -945,8 +953,8 @@ msgstr "" msgid "Deleted" msgstr "Smazána" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -962,6 +970,10 @@ msgstr "Popis" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -974,6 +986,10 @@ msgstr "Podrobnosti" msgid "Details:" msgstr "Podrobnosti:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Předáno" @@ -987,8 +1003,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "Tabulka Vížěhů" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -997,7 +1013,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1005,7 +1021,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1025,11 +1041,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1049,9 +1065,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Upravit" @@ -1061,33 +1078,33 @@ msgstr "Upravit" msgid "Edit body details" msgstr "Editace podrobností subjektu" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Úpravy hlášení %d" @@ -1108,7 +1125,6 @@ msgstr "Úprava" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1116,17 +1132,20 @@ msgstr "Úprava" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "E-mail přidán do seznamu zneužívání" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Heslo (volitelně)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1135,19 +1154,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "E-mail je již v seznamu zneužívání" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "E-mail:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "E-mail: %s" @@ -1160,16 +1178,17 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Konečné datum:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1190,14 +1209,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Zadejte blízké poštovní směrovací číslo nebo název ulice či oblasti" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Zadejte PSČ, název ulice nebo název oblasti" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Zadejte heslo" @@ -1215,8 +1234,8 @@ msgstr "Uveďte podrobnosti daného problému" msgid "Error" msgstr "Chyba" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1241,7 +1260,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1257,7 +1276,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1269,7 +1288,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1281,7 +1300,7 @@ msgstr "Doplňující data:" msgid "Extra data:" msgstr "Doplňující data:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1311,21 +1330,22 @@ msgstr "Pro opravu vyberte oblast pokrytí v části Editac #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Vyřešené" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "vyřešené - Úřad" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Vyřešené - Uživatel" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Označené za smazané" @@ -1333,7 +1353,7 @@ msgstr "Označené za smazané" msgid "Flag user" msgstr "Sledovat uživatele" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Určeno ke sledování" @@ -1342,7 +1362,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:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Takto označení uživatelé jsou v seznamu na této stránce." @@ -1350,8 +1370,8 @@ msgstr "Takto označení uživatelé jsou v seznamu na této strán msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Sledováno:" @@ -1371,7 +1391,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Více informací naleznete v článku Jak FixMyStreet používá Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1391,8 +1411,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Často kladené dotazy" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1425,12 +1449,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "OK" @@ -1438,7 +1462,7 @@ msgstr "OK" msgid "Going to send questionnaire?" msgstr "Odeslat dotazník?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1446,6 +1470,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Graf hlášení v čase a jejich stavů" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "uživatelem %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Byl tento problém vyřešen?" @@ -1466,21 +1499,26 @@ msgstr "Nápověda" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Fotografie nedávných okolních hlášení" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Přihlášená osoba: %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skrytý" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1501,21 +1539,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Skrýt staré" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Schovat značky" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1527,7 +1562,7 @@ msgstr "" msgid "History" msgstr "Historie" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Úvodní stránka" @@ -1586,6 +1621,10 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1594,6 +1633,10 @@ 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1602,7 +1645,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1611,7 +1654,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1686,11 +1729,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "Zahrnuty osobní údaje hlasatele problému" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Včetně nepotvrzených hlášení" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Chybná has_photo hodnota \"%s\"" @@ -1702,7 +1741,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1714,26 +1753,18 @@ msgstr "Interní poznámky" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Chybná agency_responsible hodnota %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Chybný konečný datum" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Chybný formát %s specified." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Chybné počáteční datum" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "Často bývá nejrychlejší zkontrolovat naše Otázky a odpovědi a podívat se, zda odpověď nenaleznete zde." @@ -1752,7 +1783,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1777,12 +1808,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1808,18 +1834,14 @@ msgstr "Poslední úpravy:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1828,13 +1850,13 @@ msgstr "" msgid "List all reported problems" msgstr "Seznam všech hlášení" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Nahrávání..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1866,12 +1888,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1879,11 +1904,11 @@ msgstr "" msgid "MAP" msgstr "MAPA" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1895,11 +1920,11 @@ msgstr "Mapa" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 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:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1919,45 +1944,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Chybějící jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Moderováno oddělením během jednoho pracovního dne" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Měsíc" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1975,9 +2000,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1988,19 +2013,23 @@ msgstr "Jméno" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Jméno:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Jméno: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2010,12 +2039,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2031,19 +2060,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Přidán nový subjekt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Do kategorie byl přidán nový kontakt" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2064,6 +2097,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "Vaše telefonní číslo:" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2093,18 +2131,19 @@ msgstr "Nová hlášení v oblasti {{NAME}} na FixMyStreet" msgid "New reports" msgstr "Nová hlášení" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Nový stav" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2112,7 +2151,7 @@ msgstr "" msgid "Next" msgstr "Další" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2124,22 +2163,18 @@ msgstr "Další" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Ne" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Žádný subjekt" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Žádný Úřad" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Není vybrán žádný úřad" @@ -2169,6 +2204,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Vráceno bez výsledku." @@ -2193,15 +2232,15 @@ msgstr "Žádný podporovatel." msgid "None" msgstr "Žádné" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2224,7 +2263,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "Není určeno pro naší oddělení" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Hlásil(a) jsem poprvé" @@ -2238,10 +2277,6 @@ msgstr "Na úřad nebylo hlášeno" msgid "Note" msgstr "Poznámka" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Upozorňujeme, že když zahrnujeme nepotvrzená hlášení, používáme datum hlášení, kdy bylo vytvořeno. To však nemusí být ve stejném měsíci, kdy bylo potvrzeno a proto se počty mohou trochu lišit" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2269,37 +2304,46 @@ msgstr "A teď stačí hlášení odeslat" msgid "Now to submit your update…" msgstr "A nyní pro odeslání aktualizace…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Starý stav" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2338,23 +2382,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Ostatní" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "ostatní oblasti:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2372,19 +2423,19 @@ msgstr "Stránka nenalezena" msgid "Parent" msgstr "Nadřazený subjekt" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Částečně" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Heslo (volitelně)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Heslo:" @@ -2392,7 +2443,7 @@ msgstr "Heslo:" msgid "Permalink" msgstr "Trvalý odkaz" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2400,19 +2451,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonní číslo" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Telefonní číslo (volitelně)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2428,7 +2484,7 @@ msgstr "Telefon:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2454,12 +2510,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Fotografie nedávných okolních hlášení" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Umísti špendlík na mapu" @@ -2481,25 +2542,34 @@ msgstr "Buďte prosím zdvořilí, struční a vyjadřujte se k věci." msgid "Please check the passwords and try again" msgstr "Zkontrolujte prosím hesla a zkuste znovu" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Zkontrolujte, zda je vaše emailová adresa správná" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Zkontrolujte, zda je vaše emailová adresa správná" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Vyberte kategorii" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Opravte prosím chyby uvedené níže" @@ -2514,39 +2584,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "prosím zadejte zprávu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Prosím zadejte vaše telefonní číslo" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Prosím zadejte heslo" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Prosím zadejte název" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Prosím zadejte platný e-mail" @@ -2555,55 +2633,62 @@ msgstr "Prosím zadejte platný e-mail" msgid "Please enter a valid email address" msgstr "Prosím zadejte platnou emailovou adresu" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Prosím zadejte vaše telefonní číslo" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Prosím zadejte podrobnosti" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Prosím zadejte váš e-mail" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Prosím zadejte vaši emailovou adresu" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Zadejte vaše jméno" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Zadejte vaše jméno" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Prosím zadejte vaše telefonní číslo" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Prosím zadejte vaše příjmení" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Zadejte nadpis" @@ -2652,7 +2737,12 @@ msgstr "" msgid "Please note:" msgstr "Vezměte prosím na vědomí:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Uveďte prosím nějaké vysvětlení, proč jste znovu otevřeli toto hlášení" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2692,6 +2782,11 @@ msgstr "Uveďte, prosím, zda byl či nebyl problém vyřešen" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Napište zprávu" @@ -2701,7 +2796,7 @@ msgid "Please write your update here" msgstr "Aktuální informace doplňte prosím zde" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Odeslat" @@ -2710,15 +2805,15 @@ msgstr "Odeslat" msgid "Posted anonymously at %s" msgstr "Nahlášeno anonymně v %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Odesláno uživatelem %s v %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Odesláno uživatelem %s (%s) v %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Odesláno uživatelem %s v %s" @@ -2730,11 +2825,11 @@ msgstr "" msgid "Previous" msgstr "Předcházející" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2751,7 +2846,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Neveřejné" @@ -2775,21 +2870,21 @@ msgstr "Hlášení %s potvrzeno" msgid "Problem %s sent to council %s" msgstr "Hlášení %s bylo odesláno na úřad %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Členění hlášení podle stavu" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Hlášení bylo označeno za otevřené." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 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:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Hlášení" @@ -2816,7 +2911,7 @@ msgstr "Hlášení označená za vyřešená na serveru FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "Hlášení v okolí %.1fkm od tohoto místa" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2842,7 +2937,8 @@ msgstr "" msgid "Property address:" msgstr "Adresa nemovitosti:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Poskytněte aktuální informace" @@ -2851,12 +2947,12 @@ msgstr "Poskytněte aktuální informace" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Poskytnutí jména a hesla je volitelné, zato vám ale umožní snadněji nahlásit problémy, hlásit aktualizace a spravovat svá hlášení." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Poskytnutí hesla je volitelné, zato vám ale umožní snadněji nahlásit problémy, hlásit aktualizace a spravovat svá hlášení." @@ -2869,12 +2965,12 @@ msgstr "" msgid "Public response:" msgstr "Veřejná reakce:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Publikovaná fotografie" @@ -2929,7 +3025,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2954,7 +3050,7 @@ msgstr "RSS kanál aktualizací tohoto hlášení" msgid "Receive email when updates are left on this problem." msgstr "Dostávat e-mail, když je hlášení aktualizováno." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2968,7 +3064,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Nedávno nahlášené problémy" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2992,9 +3088,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:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -3002,12 +3098,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Odstranit fotografii (nelze vrátit zpět!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3036,11 +3136,11 @@ msgstr "Nevhodný obsah" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Hlášení na webu %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3055,17 +3155,17 @@ msgstr "Nahlášení problému" 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:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Nahlášeno anonymně v %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Hlásil(a) jsem již dříve" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Nahlášeno uživatelem %s, určeno pro %s" @@ -3079,27 +3179,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Nahlášeno v kategorii %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Nahlášeno anonymně v %s v kategorii %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Nahlášeno v kategorii %s uživatelem %s v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Nahlášeno prostřednictvím %s anonymně v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Nahlášeno prostřednictvím %s uživatelem %s v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Nahlášeno prostřednictvím %s v kategorii %s anonymně v %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Nahlášeno prostřednictvím %s v kategorii %s uživatelem %s v %s" @@ -3108,8 +3208,8 @@ msgstr "Nahlášeno prostřednictvím %s v kategorii %s uživatelem %s v %s" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3117,10 +3217,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Hlášení problému" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Hlášení" @@ -3137,7 +3236,7 @@ msgstr "Hlášení čekající na schválení" msgid "Reports by destination" msgstr "Nahlášeno uživatelem %s, určeno pro %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3149,7 +3248,7 @@ msgstr "" msgid "Reports published" msgstr "Publikovaná hlášení" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3204,21 +3303,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3237,17 +3337,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Otočit doleva" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Otočit doprava" @@ -3257,21 +3357,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelitní" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3282,12 +3382,12 @@ msgstr "Uložit změny" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3306,7 +3406,7 @@ msgstr "Vyhledat hlášení" msgid "Search Users" msgstr "Vyhledat uživatele" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Vyhledat hlášení" @@ -3317,6 +3417,7 @@ msgid "Search:" msgstr "Vyhledat:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Nebylo nalezeno žádné hlášení." @@ -3329,7 +3430,7 @@ msgstr "Nebyli nalezeni žádní sledovaní uživatelé." msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3338,8 +3439,8 @@ msgstr "" msgid "Select a body" msgstr "Zvolte subjekt" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Zvolte oblast" @@ -3359,11 +3460,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "odesláno do %s o %s později" @@ -3372,11 +3478,11 @@ msgid "Sent:" msgstr "Odeslat:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Služba:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3385,9 +3491,9 @@ msgid "Share" msgstr "Sdílet" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3395,19 +3501,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3415,40 +3521,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Zobrazit moje jméno veřejně" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Zobrazit stará" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Zobrazit značky" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3459,12 +3562,16 @@ msgstr "Přihlásit se" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Přihlaste se nebo si vytvořte účet" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Odhlásit se" @@ -3480,7 +3587,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Některé fotografie současných hlášení" @@ -3493,15 +3600,19 @@ msgstr "Specifický název pro lokalizaci" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3534,20 +3645,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Počáteční datum:" #: templates/web/base/admin/body.html:73 @@ -3557,15 +3669,18 @@ msgstr "Počáteční datum:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Stav" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Uložit změny" @@ -3579,17 +3694,19 @@ msgstr "Uložit změny" msgid "State:" msgstr "Stav:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Stav" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistiky" @@ -3599,7 +3716,7 @@ msgstr "Statistiky" msgid "Status" msgstr "Stav" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Stále otevřeno, prostřednictvím dotazníku, %s" @@ -3612,7 +3729,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Podkategorie: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Podkategorie: %s" @@ -3629,18 +3751,19 @@ msgstr "Předmět" msgid "Subject:" msgstr "Předmět:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Odeslat" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3682,7 +3805,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3690,25 +3813,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Přehled" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Souhrnný přehled" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Souhrnný přehled" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Výsledky průzkumu" @@ -3716,14 +3845,14 @@ msgstr "Výsledky průzkumu" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Text" @@ -3731,7 +3860,7 @@ msgstr "Text" msgid "Text only version" msgstr "Pouze textová verze" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3758,7 +3887,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Děkujeme za nahrání fotografie. Nyní je třeba lokalizovat Vaše hlášení, proto prosím zadejte název nedaleké ulice nebo poštovní směrovací číslo do pole nad & nbsp;: " @@ -3774,7 +3903,7 @@ msgstr "Zdá se, že se obrázek nenahrál správně (%s), zkuste to prosím zno 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "To místo se nezdá být v České republice; prosím zkuste to znovu." @@ -3784,11 +3913,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Hlášení bude nyní opět odesláno." @@ -3824,8 +3953,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3860,8 +3989,8 @@ msgstr "Úřad nebude moci pomoci, pokud ve svém hlášení nezadáte dostatek 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:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Nastala chyba: %s" @@ -3903,7 +4032,7 @@ msgstr "Poslední hlášení uživateli označená za vyřešená" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Poslední hlášení uživatelů pro {{NAME}}" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3928,7 +4057,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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í" @@ -3941,33 +4070,38 @@ msgstr "" " Jména uživatelů se objeví veřejně v hlášeních, která nebyla označena jako anonymní. \n" " Jména nejsou nutně jedinečná." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Byl problém s kombinací e-mailu a hesla. Pokud si nemůžete vzpomenout na své heslo, nebo ho ještě nemáte, zadejte ho v sekci lsquo, přihlášení se prostřednictvím e-mailu & rsquo; tohoto formuláře." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Nastal problém s kombinací Vaší e-mailové adresy a hesla. Prosím zkuste znovu." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Byl problém s kombinací e-mailu a hesla. Pokud si nemůžete vzpomenout na své heslo, nebo ho ještě nemáte, zadejte ho v sekci lsquo, přihlášení se prostřednictvím e-mailu & rsquo; tohoto formuláře." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Nastal problém s vaší aktualizací. Prosím opakujte ještě jednou." @@ -3975,7 +4109,7 @@ msgstr "Nastal problém s vaší aktualizací. Prosím opakujte ještě jednou." 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." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Nastal problém s Vaší aktualizací. Prosím, přečtěte si informace níže." @@ -4040,26 +4174,34 @@ 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:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Tato informace je vyžadována" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Toto je vývojářský web; věci mohou kdykoli přestat fungovat, databáze bude pravidelně mazána." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4076,7 +4218,7 @@ msgstr "Hlášení nemohlo být vyřešeno" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4086,23 +4228,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Hlášení čeká na moderování operátorem." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Hlášení je aktuálně označené za uzavřené." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Hlášení je aktuálně označené za vyřešené." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Hlášení je aktuálně označené za otevřené." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Hlášení bylo zasláno anonymně." -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4113,7 +4255,7 @@ msgstr "Webová stránka také obsahuje fotografii hlášení, poskytnutou uživ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Časová osa" @@ -4125,20 +4267,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Nadpis" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Pokud chcete zjistit, jaká místní upozornění jsme pro Vás připravili, prosím, zadejte své poštovní směrovací číslo nebo název ulice či oblasti" @@ -4150,44 +4293,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 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" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Celkem" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Celkem" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4200,18 +4335,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Opakujte znovu" @@ -4226,7 +4362,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4235,15 +4375,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Nepotvrzeno" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Neznámé" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Neznámý typ upozornění" @@ -4253,13 +4389,14 @@ msgstr "Neznámý typ upozornění" msgid "Unknown error" msgstr "Neznámá chyba" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Neznámé ID hlášení" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4284,12 +4421,12 @@ msgstr "Aktualizace níže byly přidána anonymně v %s" 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Aktualizace subjektu" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Aktualizované členění podle stavu" @@ -4297,16 +4434,16 @@ msgstr "Aktualizované členění podle stavu" msgid "Update by {{name}}" msgstr "Aktualizováno uživatelem {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Aktualizací byl změněn stav hlášení na %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Nastavte označené hlášení za vyřešené" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Aktualizovat znovu otevřené hlášení" @@ -4320,20 +4457,20 @@ msgstr "Aktualizovat status" msgid "Updated" msgstr "Aktualizováno" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Odesláno uživatelem %s (%s) v %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Odesláno uživatelem %s v %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4341,7 +4478,7 @@ msgid "Updated!" msgstr "Aktualizováno!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Aktualizace" @@ -4388,40 +4525,81 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "E-mail přidán do seznamu zneužívání" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "E-mail je již v seznamu zneužívání" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Uživatel vyjmut ze sledování" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Uživatel sledován" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "V tabulce zneužívání?" #: templates/web/base/admin/users.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." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Uživatelé" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Uživatelé" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Hodnoty aktualizovány" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Vaše e-mailová adresa" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Vaše telefonní číslo:" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4443,12 +4621,7 @@ msgstr "Zobrazení oblastí" msgid "Viewing a problem" msgstr "Zobrazení hlášení" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4458,20 +4631,25 @@ msgstr "Oddělení tohoto úřadu" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Našli jsme více než jednu shodu pro požadovanou lokalitu. Nabízíme až 10 možných lokalit. Upřesněte prosím vyhledávání, pokud zde požadovanou lokalitu nenaleznete." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Nemůžeme bohužel nalézt tuto lokalitu." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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. " @@ -4479,6 +4657,12 @@ msgstr "Uvědomujeme si, že za tento problém by mohl být odpovědný % s; Ni msgid "We send it to the council on your behalf" msgstr "Vaše upozornění pošleme kompetentním úřadům v dané lokalitě" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Našli jsme více než jednu shodu pro požadovanou lokalitu. Nabízíme až 10 možných lokalit. Upřesněte prosím vyhledávání, pokud zde požadovanou lokalitu nenaleznete." + #: 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." @@ -4488,8 +4672,8 @@ msgstr "Osobní údaje budeme používat pouze v souladu s našimi MaPit." msgstr "V požadavku pro vyhledávání je možné hledat s parametrem 'agency_responsible' a omezit požadavky vrácené zpět do administrace. Hledaný výraz je administrativní ID poskytnuté službou MaPit ." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "Chcete se podílet na rozvoji projektu FixMyStreet? Náš kód je open source a je k dispozici na fixmystreet.org ." @@ -4556,16 +4744,7 @@ msgstr "Psaní zprávy pouze hůlkovým písmem je těžké číst, stejně jako msgid "Wrong location? Just click again on the map." msgstr "Chybná poloha? Stačí v mapě překliknout na jiné místo." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Rok" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4580,7 +4759,7 @@ msgstr "Rok" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Ano" @@ -4593,7 +4772,7 @@ msgstr "Ano mám heslo" 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:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4610,7 +4789,7 @@ msgstr "Upozorňuji na níže uvedený záznam, který může obsahovat urážli 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:96 +#: templates/web/base/admin/user-form.html:114 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)." @@ -4638,7 +4817,7 @@ 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:93 +#: templates/web/base/admin/body-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ý." @@ -4646,7 +4825,7 @@ msgstr "Pokud nechcete, aby byl subjekt dále na serveru aktivní, můžete ho o 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:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4673,18 +4852,38 @@ msgstr "Byli jste odhlášeni" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Lokalizovali jste hlášení do místa označeném zelenou značkou v mapě. Pokud to není správné umístění, opakujte a klikněte na správné místo v mapě. " -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Úspěšně jste potvrdili svou e-mailovou adresu." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Úspěšně jste potvrdili svou e-mailovou adresu." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Úspěšně jste potvrdili svou e-mailovou adresu." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Úspěšně jste potvrdili svou e-mailovou adresu." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Byli jste úspěšně přihlášeni; zkontrolujte a potvrďte zda jsou podrobnosti přesné:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Úspěšně jste potvrdili svou e-mailovou adresu." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Doposud jste nevytvořili žádné hlášení. Nahlaste problém nyní." @@ -4711,36 +4910,43 @@ msgid "Your Reports" msgstr "Vaše hlášení" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Váš e-mail" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Vaše e-mailová adresa" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Vaše e-mailová adresa" + #: 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ů" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4751,19 +4957,19 @@ msgstr "Vaše jméno a příjmení" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4774,8 +4980,8 @@ msgstr "Vaše heslo" msgid "Your password has been changed" msgstr "Vaše heslo bylo změněno" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Vaše telefonní číslo:" @@ -4784,7 +4990,7 @@ msgstr "Vaše telefonní číslo:" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Vaše hlášení" @@ -4793,25 +4999,40 @@ msgstr "Vaše hlášení" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Vaše heslo bylo změněno" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Vaše aktualizace" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4828,8 +5049,8 @@ msgstr "úřad" msgid "didn't use map" msgstr "bez mapy" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "např. ‘%s’ nebo ‘%s’" @@ -4852,23 +5073,24 @@ msgstr "naposledy upravené %s" msgid "less than a minute" msgstr "méně než minutou" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "neuvedeno" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "označené za nespadající do kompetencí úřadu" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "nebo mě lokalizujte automaticky" @@ -4909,7 +5131,7 @@ msgstr "V mapě se nenalézají žádné značky hlášení od uživatelů" msgid "this location" msgstr "Zobrazení oblastí" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "tento typ lokálního problému" @@ -4917,11 +5139,11 @@ msgstr "tento typ lokálního problému" msgid "today" msgstr "dnes" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4929,14 +5151,24 @@ msgstr "" msgid "used map" msgstr "použitá mapa" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "uživatel je ze stejného úřadu jako hlášení - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "uživatel je vlastníkem hlášení" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "E-mail je již v seznamu zneužívání" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "E-mail přidán do seznamu zneužívání" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5006,7 +5238,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -5014,7 +5246,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" @@ -5022,7 +5254,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" @@ -5030,7 +5262,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -5038,7 +5270,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5118,6 +5350,42 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(E-mailů v tabulce zneužívání)" + +#~ msgid "By Date" +#~ msgstr "Podle datumu" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Klikněte sem nebo vložte dd/mm/rrrr" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Potvrzená hlášení od %s do %s" + +#~ msgid "Hide old" +#~ msgstr "Skrýt staré" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Včetně nepotvrzených hlášení" + +#~ msgid "Invalid end date" +#~ msgstr "Chybný konečný datum" + +#~ msgid "Invalid start date" +#~ msgstr "Chybné počáteční datum" + +#~ msgid "No council" +#~ msgstr "Žádný Úřad" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Upozorňujeme, že když zahrnujeme nepotvrzená hlášení, používáme datum hlášení, kdy bylo vytvořeno. To však nemusí být ve stejném měsíci, kdy bylo potvrzeno a proto se počty mohou trochu lišit" + +#~ msgid "Show old" +#~ msgstr "Zobrazit stará" + +#~ msgid "Year" +#~ msgstr "Rok" + #~ msgid "%s ward, %s" #~ msgstr "%s, oddělení, %" @@ -5151,9 +5419,6 @@ msgstr[2] "" #~ msgid "No further action" #~ msgstr "Nelze opravit" -#~ msgid "Not Responsible" -#~ msgstr "Nezodpovídá" - #~ msgid "Or problems reported to:" #~ msgstr "Nebo problémy hlášené subjektu:" diff --git a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po index d8312a1bd78..d1bb8473b85 100644 --- a/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/cy.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Welsh (https://www.transifex.com/mysociety/teams/12067/cy/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "a" @@ -32,6 +32,10 @@ msgstr "a" msgid " or " msgstr "neu" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s diweddariad byw" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" @@ -91,7 +100,7 @@ msgstr "" msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -138,7 +142,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -160,8 +164,8 @@ msgstr "(anfonwyd i'r ddau)" msgid "(we also have RSS feeds for problems within %s)" msgstr "Ffrwd RSS o broblemau yn %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Dewiswch gategori --" @@ -174,14 +178,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -190,16 +186,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -208,33 +204,52 @@ msgstr "" msgid "%s live problems" msgstr "%s o broblemau byw" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Nac oes, gadewch i fi gadarnhau'r adroddiad drwy e-bost" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Nac oes, gadewch i fi gadarnhau'r adroddiad drwy e-bost" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Nac oes, gadewch i fi gadarnhau'r diweddariad drwy e-bost" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Nac oes, gadewch i fi gadarnhau'r diweddariad drwy e-bost" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Nac oes, gadewch i fi fewngofnodi drwy e-bost" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Nac oes, gadewch i fi fewngofnodi drwy e-bost" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Oes, mae gen i gyfrinair" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -248,11 +263,17 @@ msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Ychwanegu corff" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Eich cyfeiriad e-bost" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -275,11 +296,17 @@ msgstr "Ychwanegu categori newydd" msgid "Add option" msgstr "(dewisol)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "Eich rhif ffôn" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -289,23 +316,23 @@ msgstr "" msgid "Add user" msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Ychwanegwyd %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -329,9 +356,10 @@ msgstr "Analluogwyd yr hysbysiad %d (créwyd %s)" msgid "Alert me to future updates" msgstr "Rhoi gwybod am ddiweddariadau i ddod" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -340,12 +368,13 @@ msgstr "" msgid "All Reports" msgstr "Pob adroddiad" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -361,17 +390,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Pob adroddiad" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Pob adroddiad rhwng %s a %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -409,7 +438,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -420,7 +450,7 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -434,7 +464,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "" @@ -446,7 +476,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -462,12 +492,17 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Ymateb cyhoeddus:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -475,18 +510,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -500,20 +527,21 @@ msgstr "" msgid "Back" msgstr "Yn ôl" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "" +#, fuzzy +msgid "Ban user" +msgstr "Ychwanegu defnyddiwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Cyrff" @@ -524,14 +552,10 @@ msgstr "Cyrff" msgid "Body" msgstr "Corff" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Corff:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Yn ôl dyddiad" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -544,8 +568,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -556,30 +581,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Categori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Categori" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -587,17 +618,17 @@ msgstr "" msgid "Category:" msgstr "Categori:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Categori: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -605,10 +636,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Newid cyfrinair" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "Eich rhif ffôn" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -630,19 +667,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Cliciwch yma neu rhowch fel dd/mm/bbbb" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Cliciwch ar y map i adrodd problem" @@ -670,18 +702,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Ar gau" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Caewyd gan y cyngor" @@ -696,16 +729,17 @@ msgid "Cobrand" msgstr "" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -713,7 +747,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -722,7 +756,7 @@ msgstr "" msgid "Confirm" msgstr "Cadarnhau" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "" @@ -741,14 +775,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Cadarnhawyd" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Adroddiadau a gadarnhawyd rhwng %s a %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -775,8 +805,8 @@ msgstr "Cysylltu â'r tîm" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Methu dod o hyd i'r defnyddiwr" @@ -794,43 +824,16 @@ msgstr "Cyngor" msgid "Council contacts for %s" msgstr "" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Cyngor:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "" @@ -852,39 +855,44 @@ msgstr "Creu categori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Crëwyd" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Crëwyd:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Cyflwr presennol" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -895,14 +903,14 @@ msgstr "Ar hyn o bryd does dim cyrff." msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -914,12 +922,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -930,8 +938,8 @@ msgstr "" msgid "Deleted" msgstr "Dilëwyd" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -947,6 +955,10 @@ msgstr "Disgrifiad" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -959,6 +971,10 @@ msgstr "Manylion" msgid "Details:" msgstr "Manylion:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "" @@ -972,8 +988,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -982,7 +998,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -990,7 +1006,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1010,11 +1026,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1034,9 +1050,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Golygu" @@ -1046,33 +1063,33 @@ msgstr "Golygu" msgid "Edit body details" msgstr "Golygu manylion y corff" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Golygu'r broblem %d" @@ -1093,7 +1110,6 @@ msgstr "Golygydd" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1101,17 +1117,20 @@ msgstr "Golygydd" msgid "Email" msgstr "E-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Cyfrinair (dewisol)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Crëwyd hysbysiad e-bost" @@ -1120,19 +1139,18 @@ msgstr "Crëwyd hysbysiad e-bost" msgid "Email alert deleted" msgstr "Dilëwyd hysbysiad e-bost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "E-bost eisoes yn y rhestr camddefnydd" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "E-bost:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "E-bost: %s" @@ -1145,16 +1163,17 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Dyddiad dod i ben:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1175,14 +1194,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Rhowch god post, neu enw stryd ac ardal" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Rhowch enw stryd ac ardal gerllaw" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Rhowch gyfrinair" @@ -1200,8 +1219,8 @@ msgstr "Rhowch fanylion am y broblem" msgid "Error" msgstr "Gwall" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1226,7 +1245,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1242,7 +1261,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "URL allanol" @@ -1254,7 +1273,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1266,7 +1285,7 @@ msgstr "Data ychwanegol:" msgid "Extra data:" msgstr "Data ychwanegol:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1296,21 +1315,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "" @@ -1318,7 +1338,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "" @@ -1327,7 +1347,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1335,8 +1355,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "" @@ -1356,7 +1376,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1376,8 +1396,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Cwestiynau a ofynnir yn aml" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1410,12 +1434,12 @@ msgstr "Mae'n dda gennym glywed y cafodd ei drwsio!" #: 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "" @@ -1423,7 +1447,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1431,6 +1455,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "gan %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Gafodd y broblem ei thrwsio?" @@ -1451,21 +1484,26 @@ msgstr "Cymorth" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Lluniau o adroddiadau diweddar gerllaw" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Helo %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Cudd" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1486,21 +1524,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Cuddio'r hen rai" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Cuddio'r piniau" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1512,7 +1547,7 @@ msgstr "" msgid "History" msgstr "Hanes" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Hafan" @@ -1569,12 +1604,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 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." @@ -1583,7 +1626,7 @@ msgstr "Os cewch chi ragor o wybodaeth am statws eich problem, dychwelwch i'r we 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1592,7 +1635,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1664,11 +1707,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1680,7 +1719,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1692,26 +1731,18 @@ msgstr "Nodiadau mewnol" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Dyddiad dod i ben annilys" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Dyddiad cychwyn annilys" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1730,7 +1761,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1755,12 +1786,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1786,18 +1812,14 @@ msgstr "Diweddariad diwethaf:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1806,13 +1828,13 @@ msgstr "" msgid "List all reported problems" msgstr "Rhestru'r holl broblemau a adroddwyd" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Wrthi'n llwytho..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1844,12 +1866,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1857,11 +1882,11 @@ msgstr "" msgid "MAP" msgstr "MAP" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1873,11 +1898,11 @@ msgstr "Map" msgid "Mark as sent" msgstr "Nodi ei fod wedi'i anfon" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1897,45 +1922,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "jurisdiction_id coll" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Mis" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1953,9 +1978,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1966,19 +1991,23 @@ msgstr "Enw" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Enw:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Enw: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1988,12 +2017,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2007,19 +2036,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Ychwanegwyd corff newydd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2040,6 +2073,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "Eich rhif ffôn" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2069,18 +2107,19 @@ msgstr "Problemau newydd o fewn ffiniau {{NAME}} ar FixMyStreet" msgid "New reports" msgstr "Adroddiadau newydd" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2088,7 +2127,7 @@ msgstr "" msgid "Next" msgstr "Nesaf" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2100,22 +2139,18 @@ msgstr "Nesaf" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Dim corff" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Dim cyngor" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "" @@ -2145,6 +2180,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Dim canlyniadau" @@ -2167,15 +2206,15 @@ msgstr "Dim cefnogwyr" msgid "None" msgstr "Dim" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2194,7 +2233,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "" @@ -2208,10 +2247,6 @@ msgstr "" msgid "Note" msgstr "Nodyn" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2239,37 +2274,46 @@ msgstr "Nawr i gyflwyno eich adroddiad…" msgid "Now to submit your update…" msgstr "Nawr i gyflwyno eich diweddariad…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "Iawn" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Hen gyflwr" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2308,23 +2352,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "ardaloedd eraill:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2342,19 +2393,19 @@ msgstr "Ni chanfuwyd y dudalen" msgid "Parent" msgstr "Rhiant" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Rhannol" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Cyfrinair (dewisol)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Cyfrinair:" @@ -2362,7 +2413,7 @@ msgstr "Cyfrinair:" msgid "Permalink" msgstr "Dolen barhaol" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2370,19 +2421,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Rhif ffôn" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Rhif ffôn (dewisol)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Ffôn:" @@ -2398,7 +2454,7 @@ msgstr "Ffôn:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2424,12 +2480,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Lluniau o adroddiadau diweddar gerllaw" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "" @@ -2451,25 +2512,34 @@ msgstr "Byddwch yn gwrtais, yn gryno ac yn berthnasol." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Rhowch eich rhif ffôn" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2484,39 +2554,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Rhowch neges" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Rhowch eich rhif ffôn" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Rhowch gyfrinair" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Rhowch bwnc" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Rhowch e-bost dilys" @@ -2525,55 +2603,62 @@ msgstr "Rhowch e-bost dilys" msgid "Please enter a valid email address" msgstr "Rhowch gyfeiriad e-bost dilys" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Rhowch eich rhif ffôn" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Rhowch fanylion" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Rhowch eich e-bost" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Rhowch eich cyfeiriad e-bost" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Rhowch eich enw cyntaf" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Rhowch eich enw" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Rhowch eich rhif ffôn" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Rhowch eich cyfenw" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Rhowch eich teitl" @@ -2622,7 +2707,11 @@ msgstr "" msgid "Please note:" msgstr "Noder:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +msgid "Please provide a duplicate ID or public update for this report." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2662,6 +2751,11 @@ msgstr "Dywedwch a gafodd y broblem ei thrwsio" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Ysgrifennwch neges" @@ -2671,7 +2765,7 @@ msgid "Please write your update here" msgstr "Ysgrifennwch eich diweddariad yma" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2680,15 +2774,15 @@ msgstr "" msgid "Posted anonymously at %s" msgstr "Postiwyd yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Postiwyd gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Postiwyd gan %s (%s) am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Postiwyd gan %s am %s" @@ -2700,11 +2794,11 @@ msgstr "" msgid "Previous" msgstr "Blaenorol" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2721,7 +2815,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Preifat" @@ -2745,21 +2839,21 @@ msgstr "Cadarnhawyd y broblem %s" msgid "Problem %s sent to council %s" msgstr "Anfonwyd y broblem %s at y cyngor" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemau" @@ -2786,7 +2880,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "Problemau yn %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2812,7 +2906,8 @@ msgstr "" msgid "Property address:" msgstr "Cyfeiriad yr eiddo:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Darparu diweddariad" @@ -2821,12 +2916,12 @@ msgstr "Darparu diweddariad" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Mae darparu enw a chyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Mae darparu cyfrinair yn ddewisol, ond bydd yn eich galluogi i adrodd problemau'n haws, gadael diweddariadau a rheoli eich adroddiadau." @@ -2839,12 +2934,12 @@ msgstr "" msgid "Public response:" msgstr "Ymateb cyhoeddus:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Cyhoeddi llun" @@ -2899,7 +2994,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2924,7 +3019,7 @@ msgstr "Ffrwd RSS o ddiweddariadau i'r broblem hon" msgid "Receive email when updates are left on this problem." msgstr "Derbyn e-bost pan fydd diweddariadau i'r broblem hon." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2938,7 +3033,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Problemau a adroddwyd yn ddiweddar" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2960,9 +3055,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2970,12 +3065,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3004,11 +3103,11 @@ msgstr "Adrodd camddefnydd" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Adroddwyd ar %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3023,17 +3122,17 @@ msgstr "Adrodd eich problem" msgid "Report, view, or discuss local problems" msgstr "Adrodd, gweld, neu drafod problemau lleol" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Adroddwyd yn ddienw am %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Adroddwyd eisoes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Adroddwyd gan %s am %s" @@ -3047,27 +3146,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Adroddwyd yn y categori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Adroddwyd yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Adroddwyd yn y categori %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Adroddwyd drwy %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Adroddwyd drwy %s gan %s am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Adroddwyd drwy %s yn y categori %s yn ddienw am %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Adroddwyd drwy %s yn y categori %s am %s" @@ -3076,8 +3175,8 @@ msgstr "Adroddwyd drwy %s yn y categori %s am %s" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3085,10 +3184,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Adrodd problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Adroddiadau" @@ -3105,7 +3203,7 @@ msgstr "" msgid "Reports by destination" msgstr "Adroddwyd gan %s am %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3117,7 +3215,7 @@ msgstr "" msgid "Reports published" msgstr "Adroddiadau a gyhoeddwyd" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3172,21 +3270,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3205,17 +3304,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Cylchdroi i'r chwith" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Cylchdroi i'r dde" @@ -3225,21 +3324,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3250,12 +3349,12 @@ msgstr "Cadw'r newidiadau" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3273,7 +3372,7 @@ msgstr "Chwilio am adroddiadau" msgid "Search Users" msgstr "Chwilio am ddefnyddwyr" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Chwilio am adroddiadau" @@ -3284,6 +3383,7 @@ msgid "Search:" msgstr "Chwilio:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3296,7 +3396,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3305,8 +3405,8 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "" @@ -3326,11 +3426,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "" @@ -3339,11 +3444,11 @@ msgid "Sent:" msgstr "Anfonwyd:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Gwasanaeth:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3352,9 +3457,9 @@ msgid "Share" msgstr "Rhannu" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3362,19 +3467,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3382,40 +3487,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Dangos fy enw yn gyhoeddus" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Dangos yr hen rai" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Dangos piniau" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3426,12 +3528,16 @@ msgstr "Mewngofnodi" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Mewngofnodi neu greu cyfrif" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Allgofnodi" @@ -3447,7 +3553,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Lluniau o adroddiadau diweddar" @@ -3460,15 +3566,19 @@ msgstr "Testun i'w leoleiddio" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3501,20 +3611,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Dyddiad cychwyn:" #: templates/web/base/admin/body.html:73 @@ -3524,15 +3635,18 @@ msgstr "Dyddiad cychwyn:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Cyflwr" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Cadw'r newidiadau" @@ -3546,17 +3660,19 @@ msgstr "Cadw'r newidiadau" msgid "State:" msgstr "Cyflwr:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Cyflwr" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Ystadegau" @@ -3566,7 +3682,7 @@ msgstr "Ystadegau" msgid "Status" msgstr "Statws" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Ar agor o hyd, drwy holiadur, %s" @@ -3579,7 +3695,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Is-gategori: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Is-gategori: %s" @@ -3596,18 +3717,19 @@ msgstr "Pwnc" msgid "Subject:" msgstr "Pwnc:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Cyflwyno" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3649,7 +3771,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3657,25 +3779,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Crynodeb" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Adroddiadau" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Adroddiadau" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Canlyniadau arolwg" @@ -3683,14 +3811,14 @@ msgstr "Canlyniadau arolwg" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Testun" @@ -3698,7 +3826,7 @@ msgstr "Testun" msgid "Text only version" msgstr "Fersiwn testun yn unig" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3725,7 +3853,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Diolch am eich adborth" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Diolch am uwchlwytho eich llun. Nawr mae'n rhaid i ni leoli eich problem, felly rhowch enw stryd cyfagos neu god post yn y blwch uchod :" @@ -3741,7 +3869,7 @@ msgstr "Ni uwchlwythwyd y llun yn gywir (%s), ceisiwch eto." msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Mae'n ymddangos nad yw'r lleoliad hwnnw yn y DU; rhowch gynnig arall arni." @@ -3751,11 +3879,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Ailanfonir y broblem nawr." @@ -3787,8 +3915,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3821,8 +3949,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Y gwall oedd: %s" @@ -3864,7 +3992,7 @@ msgstr "" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3889,7 +4017,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3900,33 +4028,38 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Nid oes unrhyw adroddiadau i'w dangos." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Bu problem gyda'r e-bost neu gyfrinair. Os na allwch gofio eich cyfrinair, neu os nad oes un gennych, llenwch ddarn ‘mewngofnodi drwy e-bost’ y ffurflen." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Bu gwall gyda'r e-bost neu'r cyfrinair. Rhowch gynnig arall arni." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Bu problem gyda'r e-bost neu gyfrinair. Os na allwch gofio eich cyfrinair, neu os nad oes un gennych, llenwch ddarn ‘mewngofnodi drwy e-bost’ y ffurflen." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." @@ -3934,7 +4067,7 @@ msgstr "Bu gwall gyda'r diweddariad. Rhowch gynnig arall arni." msgid "There were problems with your report. Please see below." msgstr "Bu gwallau gyda'r adroddiad. Gwelwch isod." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Bu gwallau gyda'r diweddariad. Gwelwch isod." @@ -3989,26 +4122,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Mae'r wybodaeth hon yn ofynnol" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4025,7 +4166,7 @@ msgstr "Ni thrwsiwyd y broblem hon" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4035,23 +4176,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Mae'r adroddiad hwn wedi'i nodi ar gau." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Cyflwynwyd yr adroddiad yn ddienw" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4062,7 +4203,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Llinell amser" @@ -4074,20 +4215,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Teitl" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" @@ -4099,44 +4241,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Cyfanswm" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Cyfanswm" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4149,18 +4283,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Ceisio eto" @@ -4175,7 +4310,11 @@ msgstr "Ceisiwch anfon e-bost atom yn uniongyrchol:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4184,15 +4323,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Heb ei gadarnhau" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Anhysbys" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -4202,13 +4337,14 @@ msgstr "" msgid "Unknown error" msgstr "Gwall anhysbys" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4233,12 +4369,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4246,16 +4382,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -4269,20 +4405,20 @@ msgstr "" msgid "Updated" msgstr "Diweddarwyd" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Postiwyd gan %s (%s) am %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Postiwyd gan %s am %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4290,7 +4426,7 @@ msgid "Updated!" msgstr "Diweddarwyd!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Diweddariadau" @@ -4337,40 +4473,80 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "E-bost eisoes yn y rhestr camddefnydd" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +msgid "User in abuse table" msgstr "" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Defnyddwyr" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Defnyddwyr" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Eich cyfeiriad e-bost" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Eich rhif ffôn" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4392,12 +4568,7 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4407,20 +4578,25 @@ msgstr "Wardiau'r cyngor hwn" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "" +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Mae'n ddrwg gennym, ni allwn ddod o hyd i'r lleoliad hwnnw." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "" @@ -4428,6 +4604,11 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4437,8 +4618,8 @@ msgstr "Rydym ond yn defnyddio eich gwybodaeth bersonol yn unol â'n MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4505,16 +4690,7 @@ msgstr "Mae ysgrifennu eich holl neges mewn priflythrennau yn ei gwneud hi'n ano msgid "Wrong location? Just click again on the map." msgstr "Lleoliad anghywir? Cliciwch ar y map eto." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Blwyddyn" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4529,7 +4705,7 @@ msgstr "Blwyddyn" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "" @@ -4542,7 +4718,7 @@ msgstr "Oes, mae gen i gyfrinair" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4559,7 +4735,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:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4585,7 +4761,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4593,7 +4769,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "Gwrthodoch chi; llenwch y blwch uchod" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4620,18 +4796,38 @@ msgstr "" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Rhowch eich rhif ffôn" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Rhowch eich rhif ffôn" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Rhowch eich rhif ffôn" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Mewngofnodwyd yn llwyddiannus; gwiriwch a chadarnhewch fod eich manylion yn gywir:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Rhowch eich rhif ffôn" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4655,36 +4851,43 @@ msgid "Your Reports" msgstr "Eich adroddiadau" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Eich e-bost" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Eich cyfeiriad e-bost" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Eich cyfeiriad e-bost" + #: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4695,19 +4898,19 @@ msgstr "Eich enw" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4718,8 +4921,8 @@ msgstr "Eich cyfrinair" msgid "Your password has been changed" msgstr "Newidiwyd eich cyfrinair" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Eich rhif ffôn" @@ -4728,7 +4931,7 @@ msgstr "Eich rhif ffôn" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Eich adroddiadau" @@ -4737,25 +4940,40 @@ msgstr "Eich adroddiadau" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Newidiwyd eich cyfrinair" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Eich diweddariadau" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4772,8 +4990,8 @@ msgstr "cyngor" msgid "didn't use map" msgstr "" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "e.e. '%s' neu '%s'" @@ -4796,22 +5014,23 @@ msgstr "diweddarwyd ddiwethaf %s" msgid "less than a minute" msgstr "llai na munud" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "ddim yn berthnasol" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "neu dewch o hyd i fi'n awtomatig" @@ -4852,7 +5071,7 @@ msgstr "" msgid "this location" msgstr "y cyngor lleol" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4860,11 +5079,11 @@ msgstr "" msgid "today" msgstr "heddiw" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4872,14 +5091,24 @@ msgstr "" msgid "used map" msgstr "" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "E-bost eisoes yn y rhestr camddefnydd" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Ychwanegwyd yr e-bost at y rhestr camddefnydd" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4957,7 +5186,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -4966,7 +5195,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" @@ -4975,7 +5204,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" @@ -4984,7 +5213,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -4993,7 +5222,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5083,6 +5312,33 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#~ msgid "By Date" +#~ msgstr "Yn ôl dyddiad" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Cliciwch yma neu rhowch fel dd/mm/bbbb" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Adroddiadau a gadarnhawyd rhwng %s a %s" + +#~ msgid "Hide old" +#~ msgstr "Cuddio'r hen rai" + +#~ msgid "Invalid end date" +#~ msgstr "Dyddiad dod i ben annilys" + +#~ msgid "Invalid start date" +#~ msgstr "Dyddiad cychwyn annilys" + +#~ msgid "No council" +#~ msgstr "Dim cyngor" + +#~ msgid "Show old" +#~ msgstr "Dangos yr hen rai" + +#~ msgid "Year" +#~ msgstr "Blwyddyn" + #~ msgid "%s ward, %s" #~ msgstr "ward %s, %s" diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po index 5ddb8f3e199..e73801bff77 100644 --- a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Danish (Denmark) (https://www.transifex.com/mysociety/teams/12067/da_DK/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr " og " @@ -32,6 +32,10 @@ msgstr " og " msgid " or " msgstr " eller " +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d redigeringer af %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s myndighedskontakter – %s bekræftet, %s ubekræftet" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s aktive opdateringer" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s spørgeskemaer sendt – %s besvaret (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s spørgeskemaer sendt – %s besvaret (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© OpenStreetMap -bidragsydere" @@ -99,11 +108,6 @@ msgstr "© OpenStreetMap< msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Epost i misbrugstabellen)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som graffite, affald, hul i vejen, eller ødelagt gadelys)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -161,8 +165,8 @@ msgstr "(sendt til begge)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS-strøm for problemer indenfor %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Vælg en kategori --" @@ -175,14 +179,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -191,16 +187,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "MAPIT_URL er sat, (%s) men ingen MAPIT_TYPES.
Dette er nok grunden til at \"dækket område\" er tom (nedenfor).
Måske skal du tilføje nogen MAPIT_TYPES i konfigurationsfilen?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -209,33 +205,52 @@ msgstr "" msgid "%s live problems" msgstr "%s aktive problemer" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Nej Lad mig bekræfte min rapport med e-post" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Nej Lad mig bekræfte min rapport med e-post" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Nej Lad mig bekræfte min opdatering med e-post" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Nej Lad mig bekræfte min opdatering med e-post" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Nej, lad mig logge ind med e-post:" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Nej, lad mig logge ind med e-post:" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Ja, jeg har en adgangskode" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -249,11 +264,17 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Tilføj myndighed" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Bandlys epostadresse" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -276,11 +297,17 @@ msgstr "Tilføj ny kategori" msgid "Add option" msgstr "(valgfrit)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "Dit telefonnummer" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -290,23 +317,23 @@ msgstr "" msgid "Add user" msgstr "Tilføj bruger" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Tilføjede %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -330,9 +357,10 @@ msgstr "Varsel %d koblet fra (oprettet %s)" msgid "Alert me to future updates" msgstr "Send mig varsel ved fremtidige opdateringer" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -341,12 +369,13 @@ msgstr "" msgid "All Reports" msgstr "Alle rapporter" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -362,17 +391,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alle rapporter" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Alle rapporter mellem %s og %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -410,7 +439,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -421,7 +451,7 @@ msgstr "" msgid "Area covered" msgstr "Dækket område" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -435,7 +465,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Flyt til en anden kategori:" @@ -447,7 +477,7 @@ msgstr "Tildel til ekstern myndighed:" msgid "Assign to subdivision:" msgstr "Tildelt underafdeling:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -463,12 +493,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Ikke ansvarlig" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -476,18 +511,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -501,20 +528,21 @@ msgstr "Afventer moderation" msgid "Back" msgstr "Tilbage" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Bandlys epostadresse" +#, fuzzy +msgid "Ban user" +msgstr "Markér bruger" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Administrationer" @@ -525,14 +553,10 @@ msgstr "Administrationer" msgid "Body" msgstr "Administration" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Administration:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "På dato" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -545,8 +569,9 @@ 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:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -557,30 +582,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategori" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -588,17 +619,17 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uger gamle" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategori: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -606,10 +637,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Skift adgangskode" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "Dit telefonnummer" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -636,19 +673,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Klik her eller indtast dato på formatet dd/mm/åååå" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klik i kortet for at rapportere et problem" @@ -676,18 +708,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Lukket af myndigheden" @@ -702,16 +735,17 @@ msgid "Cobrand" msgstr "Mærkevaresamarbejde" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Mærkevaresamarbejdsdata:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Mærkevaresamarbejde:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -719,7 +753,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Opsætning" @@ -728,7 +762,7 @@ msgstr "Opsætning" msgid "Confirm" msgstr "Bekræft" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Bekræft konto" @@ -747,14 +781,10 @@ msgstr "Bekræftelse" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Bekræftet" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Bekræftede rapporter mellem %s og %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -781,8 +811,8 @@ msgstr "Kontakt projektgruppen" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Kunne ikke finde bruger" @@ -800,43 +830,16 @@ msgstr "Administration" msgid "Council contacts for %s" msgstr "Administrationskontakter for %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "myndighedsreference: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Administration:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Antal" @@ -858,39 +861,44 @@ msgstr "Lav kategori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Oprettet" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Oprettet:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Gældende tilstand" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -901,14 +909,14 @@ msgstr "I øjeblikket er der ikke lavet nogen instanser." msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Oversigt" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Behandlet af underafdeling inden 5 arbejdsdage" @@ -920,12 +928,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -936,8 +944,8 @@ msgstr "" msgid "Deleted" msgstr "Slettet" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -953,6 +961,10 @@ msgstr "Beskrivelse" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -965,6 +977,10 @@ msgstr "Detaljer" msgid "Details:" msgstr "Detaljer:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Delegeret" @@ -978,8 +994,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "Arbejdsheste" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -988,7 +1004,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -996,7 +1012,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1016,11 +1032,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1043,9 +1059,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Redigér" @@ -1055,33 +1072,33 @@ msgstr "Redigér" msgid "Edit body details" msgstr "Redigér detaljer for myndighed" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Redigér problem %d" @@ -1102,7 +1119,6 @@ msgstr "Opdateret af" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1110,17 +1126,20 @@ msgstr "Opdateret af" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Epost lagt til misbrugsliste" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Adgangskode (valgfrit)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Epostvarsel laget" @@ -1129,19 +1148,18 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Epost allerede i misbrugslisten" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "E-post: %s" @@ -1157,8 +1175,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/body-form.html:123 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" @@ -1168,8 +1186,9 @@ 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Slut-dato:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1190,14 +1209,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Indtast postnummer i nærheden, eller vejnavn og sted" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Indtast et vejnavn og sted" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Indtast en ny adgangskode" @@ -1215,8 +1234,8 @@ msgstr "Indtast detaljer om problemet" msgid "Error" msgstr "Fejl" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1241,7 +1260,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1257,7 +1276,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "Eksternt link" @@ -1269,7 +1288,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1281,7 +1300,7 @@ msgstr "Ekstra data:" msgid "Extra data:" msgstr "Ekstra data:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1311,21 +1330,22 @@ msgstr "Fiks dette ved at vælge en area covered i Edit bo #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Løst" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Løst - Administration" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Løst - Bruger" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Markér som slettet" @@ -1333,7 +1353,7 @@ msgstr "Markér som slettet" msgid "Flag user" msgstr "Markér bruger" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Markeret:" @@ -1342,7 +1362,7 @@ msgstr "Markeret:" msgid "Flagged reports and users" msgstr "Markerede rapporter og brugere" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Markerede brugere er listet op på Markerede-siden." @@ -1350,8 +1370,8 @@ msgstr "Markerede brugere er listet op på Markerede-siden." msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Markeret:" @@ -1371,7 +1391,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "For mere information, se Hvordan FixMyStreet bruger Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1391,8 +1411,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Ofte spurgte spørgsmål" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1425,12 +1449,12 @@ msgstr "Glad for at høre at det er i orden!" #: 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Søg" @@ -1438,7 +1462,7 @@ msgstr "Søg" msgid "Going to send questionnaire?" msgstr "Skal der sendes spørgeskema?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1446,6 +1470,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Graf over problemoprettelse fordelt på status over tid" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "af %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Er dette problem blevet løst?" @@ -1466,21 +1499,26 @@ msgstr "Hjælp" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Billeder af nye problemer i nærheden" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hej, %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjul" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1501,21 +1539,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Skjul gamle" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Skjul nåle" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1527,7 +1562,7 @@ msgstr "" msgid "History" msgstr "Historie" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Hjem" @@ -1584,12 +1619,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 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." @@ -1598,7 +1641,7 @@ msgstr "Hvis du får mere information om status for dit problem, så vær sød a 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1607,7 +1650,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1686,11 +1729,7 @@ msgstr "Tom indboks, her kommer vi!" msgid "Include reporter personal details" msgstr "Inkludér rapportørens personlige detaljer" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Inkludér ubekræftede problemer" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Forkert has_photo-værdi \"%s\"" @@ -1702,7 +1741,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1714,26 +1753,18 @@ msgstr "Interne notater" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-værdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Ugyldig slut-dato" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Ugyldigt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Ugyldig startdato" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "Det er ofte hurtigst at tjekke vores FAQ og se om svaret er der." @@ -1752,7 +1783,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1777,12 +1808,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1808,18 +1834,14 @@ msgstr "Sidste opdatering:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1828,13 +1850,13 @@ msgstr "" msgid "List all reported problems" msgstr "List alle rapporterede problemer" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Indlæser..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1866,12 +1888,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1879,11 +1904,11 @@ msgstr "" msgid "MAP" msgstr "KORT" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1895,11 +1920,11 @@ msgstr "Kort" msgid "Mark as sent" msgstr "Markér som afsendt" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 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:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1919,45 +1944,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Modereret af afdeling inden for en arbejdsdag" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Måned" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1975,9 +2000,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1988,19 +2013,23 @@ msgstr "Navn" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Navn:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Navn: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2010,12 +2039,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2031,19 +2060,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Ny myndighed tilføjet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Ny kategorikontakt tilføjet" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2064,6 +2097,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "Dit telefonnummer" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2093,18 +2131,19 @@ msgstr "Nye rapporter indenfor grænsen for {{NAME}} på FixMinVej" msgid "New reports" msgstr "Nye rapporter" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Ny tilstand" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2112,7 +2151,7 @@ msgstr "" msgid "Next" msgstr "Næste" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2124,22 +2163,18 @@ msgstr "Næste" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Nej" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Ingen myndighed" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Ingen myndighed" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Ingen myndighed er valgt" @@ -2169,6 +2204,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Ingen resultater returneret" @@ -2194,15 +2233,15 @@ msgstr "Ingen supportere" msgid "None" msgstr "Ingen" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2225,7 +2264,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "Ikke for min underafdeling" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Ikke rapporteret tidligere" @@ -2239,10 +2278,6 @@ msgstr "Ikke rapporteret til myndigheden" msgid "Note" msgstr "Bemærk" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Bemærk at når vi medtager ubekræftede rapporter så bruges datoen som rapporten var oprettet, hvilket ikke behøver være den samme måned som rapporten blev bekræftet, så tallene kan hoppe lidt op og ned." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2270,37 +2305,46 @@ msgstr "På tide at sende din rapport…" msgid "Now to submit your update…" msgstr "På tide at registrere din opdatering…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Gammel tilstand" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2339,23 +2383,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Andet" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "andre områder:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2373,19 +2424,19 @@ msgstr "Fandt ikke siden" msgid "Parent" msgstr "Forælder" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Adgangskode (valgfrit)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Adgangskode:" @@ -2393,7 +2444,7 @@ msgstr "Adgangskode:" msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2401,19 +2452,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Telefonnummer (valgfrit)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2429,7 +2485,7 @@ msgstr "Telefon:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2455,12 +2511,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Billeder af nye problemer i nærheden" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Placér tegnestiften på kortet" @@ -2482,25 +2543,34 @@ msgstr "Vær høflig, præcis og kortfattet." msgid "Please check the passwords and try again" msgstr "Venligst kontrollér adgangskoderne og prøv igen" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Venligst kontrollér at du har skrevet en gyldig e-postadresse" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Vælg en kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Husk at rette op på fejlene nedenfor." @@ -2515,39 +2585,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Venligst indlæg en besked" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Angiv dit telefonnummer." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Indtast en adgangskode" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Venligst angiv et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Tilføj en gyldig e-post" @@ -2556,55 +2634,62 @@ msgstr "Tilføj en gyldig e-post" msgid "Please enter a valid email address" msgstr "Angiv din e-post" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Angiv dit telefonnummer." + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Angiv oplysninger om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Angiv din e-post" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Venligst angiv din e-postadresse" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Venligst angiv dit fornavn" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Angiv dit navn" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Angiv dit telefonnummer." -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Venligst angiv dit mellemnavn" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Venligst angiv din titel" @@ -2655,7 +2740,12 @@ msgstr "" msgid "Please note:" msgstr "Venligst bemærk:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Venligst bidrag med en forklaring på hvorfor du genåbner denne problemrapport" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2695,6 +2785,11 @@ msgstr "Venligs angiv om dette problem er blevet fikset eller ikke" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Indtast en besked" @@ -2704,7 +2799,7 @@ msgid "Please write your update here" msgstr "Indtast venligst din opdatering her" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Indsend" @@ -2713,15 +2808,15 @@ msgstr "Indsend" msgid "Posted anonymously at %s" msgstr "Publiceret anonymt %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Sendt ind af %s %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Sendt ind af %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Sendt ind af %s %s" @@ -2733,11 +2828,11 @@ msgstr "" msgid "Previous" msgstr "Forrige" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2754,7 +2849,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privat" @@ -2778,21 +2873,21 @@ msgstr "Problem %s bekræftet" msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til myndighed %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling af problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problem markeret som åbent." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Problemtilstandsændring baseret på spørgeundersøgelsesresultater" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemer" @@ -2819,7 +2914,7 @@ msgstr "Problemer nyligt rapporteret fikset på FixMinVej" msgid "Problems within %.1fkm of %s" msgstr "Problemer indenfor %.1fkm fra denne positionen" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2845,7 +2940,8 @@ msgstr "" msgid "Property address:" msgstr "Ejendomsadresse:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidrag med en opdatering" @@ -2854,12 +2950,12 @@ msgstr "Bidrag med en opdatering" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valgfrit at angive navn og adgangskode, men hvis du gør det kan du nemmere rapportere problemer, lave opdateringer og håndtere dine rapporter." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valgfrit at angive en adgangskode, men hvis du gør det vil det blive nemmere for dig at rapportere problemer, lave opdateringer og håndtere dine rapporter" @@ -2872,12 +2968,12 @@ msgstr "" msgid "Public response:" msgstr "Offentlig respons:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Publicér billede" @@ -2932,7 +3028,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2957,7 +3053,7 @@ msgstr "RSS-strøm med opdateringer for dette problem" msgid "Receive email when updates are left on this problem." msgstr "Modtag e-post når der er opdateringer på dette problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2971,7 +3067,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Nyligt meldte problemer" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2995,9 +3091,9 @@ msgstr "Fjern markering" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -3005,12 +3101,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern billede (kan ikke fortrydes!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3039,11 +3139,11 @@ msgstr "Rapportér misbrug" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Rapport på %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3058,17 +3158,17 @@ msgstr "Rapportér dit problem" msgid "Report, view, or discuss local problems" msgstr "Rapportér, find eller diskutér lokale problemer" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Rapporteret anonymt %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Rapporteret tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Publiceret af %s %s" @@ -3082,27 +3182,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Rapporteret i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Rapporteret i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Rapporteret i kategorien %s af %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Publiceret af %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Rapporteret af %s af %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Rapporteret af %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapporteret af %s i kategorien %s af %s %s" @@ -3111,8 +3211,8 @@ msgstr "Rapporteret af %s i kategorien %s af %s %s" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3120,10 +3220,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Rapporterer et problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Rapporter" @@ -3140,7 +3239,7 @@ msgstr "Rapporter som venter på godkendelse" msgid "Reports by destination" msgstr "Publiceret af %s %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3152,7 +3251,7 @@ msgstr "" msgid "Reports published" msgstr "Publicerede rapporter" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3207,21 +3306,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3240,17 +3340,17 @@ 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:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rotér til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Rotér til højre" @@ -3260,21 +3360,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelit" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3285,12 +3385,12 @@ msgstr "Gem ændringer" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3309,7 +3409,7 @@ msgstr "Søg i rapporter" msgid "Search Users" msgstr "Søg i brugere" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Søg i rapporter" @@ -3320,6 +3420,7 @@ msgid "Search:" msgstr "Søg:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Søgningen fandt ingen rapporter." @@ -3332,7 +3433,7 @@ msgstr "Søgningen fandt ingen brugere." msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3341,8 +3442,8 @@ msgstr "" msgid "Select a body" msgstr "Vælg en myndighed" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Vælg et område" @@ -3362,11 +3463,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -3375,11 +3481,11 @@ msgid "Sent:" msgstr "Sendt:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Tjeneste:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3388,9 +3494,9 @@ msgid "Share" msgstr "Del" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3398,19 +3504,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3418,40 +3524,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Vis mit navn offentligt" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Vis gamle" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Vis nåle" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3462,12 +3565,16 @@ msgstr "Log ind" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Log ind eller opret en konto" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Log ud" @@ -3486,7 +3593,7 @@ msgstr "" " for at indikere at rapporterne bliver sendt\n" "fra din FixMinVej installation." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Nogen billeder af nylig meldte problemer" @@ -3499,15 +3606,19 @@ msgstr "Noget tekst at oversætte" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3540,20 +3651,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Start-dato:" #: templates/web/base/admin/body.html:73 @@ -3563,15 +3675,18 @@ msgstr "Start-dato:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Tilstand" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Gem ændringer" @@ -3585,17 +3700,19 @@ msgstr "Gem ændringer" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Tilstand" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistik" @@ -3605,7 +3722,7 @@ msgstr "Statistik" msgid "Status" msgstr "Status" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Fortsat åben via spørgeskema, %s" @@ -3618,7 +3735,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Underkategori: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Underkategori: %s" @@ -3635,18 +3757,19 @@ msgstr "Emne" msgid "Subject:" msgstr "Emne:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Send ind" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3688,7 +3811,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3696,25 +3819,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Opsummering" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Opsummeringsrapporter" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Opsummeringsrapporter" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Resultater fra spørgeundersøgelsen" @@ -3722,14 +3851,14 @@ msgstr "Resultater fra spørgeundersøgelsen" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -3737,7 +3866,7 @@ msgstr "Tekst" msgid "Text only version" msgstr "Tekst-version" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3764,7 +3893,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Tak for din tilbagemelding" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Tak for at du har lagt dit billede op. Vi skal nu placere dit problem, så vær sød at indtaste navnet på en vej eller et postnummer i området i boksen ovenfor :" @@ -3780,7 +3909,7 @@ msgstr "Billedet ser ikke ud til at være blevet lagt op rigtigt (%s), prøv ige 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Det sted virker ikke til at være i Storbritannien. Venligst prøv igen." @@ -3790,11 +3919,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Det problem er blevet markeret som sendt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Det problem vil nu blive sendt igen." @@ -3832,8 +3961,8 @@ 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3874,8 +4003,8 @@ msgstr "" 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:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Fejlen var: %s" @@ -3917,7 +4046,7 @@ msgstr "De sidste problemer som er rapporteret fikset af brugere" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "De sidste problemer indenfor grænsen til {{NAME}} rapporteret af brugere" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3942,7 +4071,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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" @@ -3955,33 +4084,38 @@ msgstr "" "Brugerens navn vises offentligt på rapporter som ikke er markeret med anonymt.\n" "Navne er ikke nødvendigvis unikke." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Der er ingen rapporter at vise." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Der var problemer med din e-post/adgangskode-kombination. Hvis du har glemt din adgangskode, eller hvis du ikke har en, så udfyld venligst 'Log ind via e-post'-delen af skemaet" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Der var problemer med din epost/adgangskode-kombination. Vær sød at forsøge igen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Der var problemer med din e-post/adgangskode-kombination. Hvis du har glemt din adgangskode, eller hvis du ikke har en, så udfyld venligst 'Log ind via e-post'-delen af skemaet" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 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." @@ -3989,7 +4123,7 @@ msgstr "Der var problemer med din opdatering. Vær sød at forsøge igen." msgid "There were problems with your report. Please see below." msgstr "Der var problemer med din rapport. Venligst se nedenfor." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Der var problemer med din opdatering. Venligst se nedenfor." @@ -4053,26 +4187,34 @@ 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:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Denne information er påkrævet" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Dette er et udviklernetsted.Ting kan gå i stykker når som helst og databasen vil blive slettet periodisk." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4089,7 +4231,7 @@ msgstr "Dette problem er ikke blevet løst" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4099,23 +4241,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Denne rapport afventer moderation" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Denne rapport er for tiden markeret som lukket." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Denne rapport er for tiden markeret som fikset." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Denne rapport er for tiden markeret som åben." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Denne rapport blev rapporteret anonymt" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4126,7 +4268,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4138,20 +4280,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Titel" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Du finder lokale problemer ved at søge på dit postnummer, vejnavn eller sted" @@ -4163,44 +4306,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 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." -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Totalt" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Totalt" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4213,18 +4348,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Prøv igen" @@ -4239,7 +4375,11 @@ msgstr "Forsøg at sende epost direkte til os:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4248,15 +4388,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Ubekræftet" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Ukendt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Ukendt varsel-type" @@ -4266,13 +4402,14 @@ msgstr "Ukendt varsel-type" msgid "Unknown error" msgstr "Ukendt fejl" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Ukendt problem-Id" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4297,12 +4434,12 @@ msgstr "Opdateringen nedenfor lagt ind anonymt %s" msgid "Update below added by %s at %s" msgstr "Opdateringen nedenfor tilføjet af %s %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Opdatér myndighed" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Tilstandsfordeling for opdateringer" @@ -4310,16 +4447,16 @@ msgstr "Tilstandsfordeling for opdateringer" msgid "Update by {{name}}" msgstr "Opdateret af {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "En opdatering ændrede problemets status til %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "En opdatering markerede dette problem som fikset." -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "En opdatering gennåbnede problemet" @@ -4333,20 +4470,20 @@ msgstr "Opdatér tilstanden" msgid "Updated" msgstr "Opdateret" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Sendt ind af %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Sendt ind af %s %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4354,7 +4491,7 @@ msgid "Updated!" msgstr "Opdateret!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Opdateringer" @@ -4401,40 +4538,81 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Epost lagt til misbrugsliste" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Epost allerede i misbrugslisten" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Brugermarkering fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Bruger markeret" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "I misbrugstabel?" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Brugersøgning finder træf på brugernavne og epostadresser. " -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Brugere" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Brugere" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Værdier opdateret" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Din e-postadresse" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Dit telefonnummer" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4456,12 +4634,7 @@ msgstr "Ser på et sted" msgid "Viewing a problem" msgstr "Ser på et problem" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4471,20 +4644,25 @@ msgstr "Bydele indenfor denne myndighed" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Vi fandt mere en et træf for dette sted. Vi viser op til ti træf, så forsøg en anden søgning hvis dit sted ikke er her." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Beklager, men vi kunne ikke finde dette sted." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4492,6 +4670,12 @@ msgstr "Vi indser at %s kan være ansvarlig for dette problem, men vi mangler fo msgid "We send it to the council on your behalf" msgstr "Vi sender til myndigheden på dine vegne" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Vi fandt mere en et træf for dette sted. Vi viser op til ti træf, så forsøg en anden søgning hvis dit sted ikke er her." + #: 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." @@ -4501,8 +4685,8 @@ msgstr "Vi vil kun bruge personlig information om dig i henhold til vore MaPit." msgstr "Når du søger efter forespørgsler, så er det også muligt at søge efter agency_responsible for at begrænse det til forespørgsler som er sendt til en enkelt admindstration. Søgtetermen er administrations-IDen som angivet af MaPit." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "Kunne du tænke dig at bidrage til FixMinVej? Vores kKildekoden er frit programmel og tilgængelig via fixmystreet.org." @@ -4569,16 +4757,7 @@ msgstr "Når du skriver din besked med kun store bogstaver bliver den vanskelig msgid "Wrong location? Just click again on the map." msgstr "Forkert sted? Bare klik igen på kortet." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "År" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4593,7 +4772,7 @@ msgstr "År" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Ja" @@ -4606,7 +4785,7 @@ msgstr "Ja, jeg har en adgangskode" 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:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4623,7 +4802,7 @@ msgstr "Du rapporterer at følgende opdatering er stødende, indeholder personli 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:96 +#: templates/web/base/admin/user-form.html:114 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." @@ -4651,7 +4830,7 @@ 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:93 +#: templates/web/base/admin/body-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." @@ -4659,7 +4838,7 @@ msgstr "Du kan markere en myndighed som slettet hvis du ikke ønsker at den skal msgid "You declined; please fill in the box above" msgstr "Du afviste; venligst udfyld boksen ovenfor" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4686,18 +4865,38 @@ msgstr "Du er allerede logget ud" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Du har placeret problemet ved punktet i kortet som er markeret med en grøn nål. Hvis dette ikke er korrekt placering kan du klikke på kortet igen." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Du har nu lykkes med at bekræfte din e-postadresse." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Du har nu lykkes med at bekræfte din e-postadresse." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Du har nu lykkes med at bekræfte din e-postadresse." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Du har nu lykkes med at bekræfte din e-postadresse." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har lykkes med at logge ind. Venligst kontrollér og bekræft at dine detaljer er korrekte:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Du har nu lykkes med at bekræfte din e-postadresse." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Du har ikke lavet en rapport endnu. Rapportér et problem nu." @@ -4723,36 +4922,43 @@ msgid "Your Reports" msgstr "Dine rapporter" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Din e-post" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Din e-postadresse" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Din e-postadresse" + #: 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." -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4763,19 +4969,19 @@ msgstr "Dit navn" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4786,8 +4992,8 @@ msgstr "Din adgangskode" msgid "Your password has been changed" msgstr "Din adgangskode er blevet ændret" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Dit telefonnummer" @@ -4796,7 +5002,7 @@ msgstr "Dit telefonnummer" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Dine opdateringer" @@ -4805,25 +5011,40 @@ msgstr "Dine opdateringer" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Din adgangskode er blevet ændret" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Dine opdateringer" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4840,8 +5061,8 @@ msgstr "myndighed (fx kommune)" msgid "didn't use map" msgstr "brugte ikke kort" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "for eksempel '%s' eller '%s'" @@ -4864,23 +5085,24 @@ msgstr "sidst opdateret %s" msgid "less than a minute" msgstr "mindre end et minut" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "markeret som ikke myndighedens ansvar" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "eller find min position automatisk" @@ -4921,7 +5143,7 @@ msgstr "Der vises ingen nål på grund af at brugeren ikke brugte kortet" msgid "this location" msgstr "Ser på et sted" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "denne type lokalt problem" @@ -4929,11 +5151,11 @@ msgstr "denne type lokalt problem" msgid "today" msgstr "idag" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4941,14 +5163,24 @@ msgstr "" msgid "used map" msgstr "brugte kort" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "bruger er fra samme myndighed som problemet - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "bruger er ejer af problemet" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Epost allerede i misbrugslisten" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Epost lagt til misbrugsliste" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5010,35 +5242,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5108,6 +5340,42 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(Epost i misbrugstabellen)" + +#~ msgid "By Date" +#~ msgstr "På dato" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Klik her eller indtast dato på formatet dd/mm/åååå" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Bekræftede rapporter mellem %s og %s" + +#~ msgid "Hide old" +#~ msgstr "Skjul gamle" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Inkludér ubekræftede problemer" + +#~ msgid "Invalid end date" +#~ msgstr "Ugyldig slut-dato" + +#~ msgid "Invalid start date" +#~ msgstr "Ugyldig startdato" + +#~ msgid "No council" +#~ msgstr "Ingen myndighed" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Bemærk at når vi medtager ubekræftede rapporter så bruges datoen som rapporten var oprettet, hvilket ikke behøver være den samme måned som rapporten blev bekræftet, så tallene kan hoppe lidt op og ned." + +#~ msgid "Show old" +#~ msgstr "Vis gamle" + +#~ msgid "Year" +#~ msgstr "År" + #~ msgid "%s ward, %s" #~ msgstr "%s bydel, %s" @@ -5141,9 +5409,6 @@ msgstr[1] "" #~ msgid "No further action" #~ msgstr "Kan ikke fikses" -#~ msgid "Not Responsible" -#~ msgstr "Ikke ansvarlig" - #~ msgid "Or problems reported to:" #~ msgstr "Eller problemer meldt til:" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index 7e805914161..7914c833587 100644 --- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: German (Switzerland) (https://www.transifex.com/mysociety/teams/12067/de_CH/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "und" @@ -32,6 +32,10 @@ msgstr "und" msgid " or " msgstr "oder" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s interne Stellen – %s bestätigt, %s unbestätigt" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" @@ -91,7 +100,7 @@ msgstr "" msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "(Schaden & Ort des Schadens)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -138,7 +142,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -159,8 +163,8 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" @@ -173,14 +177,6 @@ msgstr "Vorlage wählen" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -189,17 +185,17 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -208,33 +204,52 @@ msgstr "" msgid "%s live problems" msgstr "%s Meldungen Total" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Meldung per E-Mail bestätigen" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Meldung per E-Mail bestätigen" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Meldung per E-Mail bestätigen" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Neu Registrieren" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Neu Registrieren" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Passwort" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -248,11 +263,17 @@ msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Adresse hinzufügen" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Neue E-Mail Adresse" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -275,11 +296,17 @@ msgstr "Füge neue Kategorie hinzu" msgid "Add option" msgstr "optional" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "Ihre Telefonnummer" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -289,23 +316,23 @@ msgstr "" msgid "Add user" msgstr "User hinzufügen" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "Füge neue Kategorie hinzu" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "Vorlagen für %s" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -329,9 +356,10 @@ msgstr "" msgid "Alert me to future updates" msgstr "" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -340,12 +368,13 @@ msgstr "" msgid "All Reports" msgstr "Alle Meldungen" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Als CSV exportieren" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Alle Kategorien" @@ -361,17 +390,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alle Meldungen" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Alle Meldungen von %s bis %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -409,7 +438,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -420,7 +450,7 @@ msgstr "" msgid "Area covered" msgstr "Gebiet" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -434,7 +464,7 @@ msgid "Assign to competent body:" msgstr "Nachricht an zuständige Stelle:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Einer anderen Kategorie (DA) zuweisen" @@ -446,7 +476,7 @@ msgstr "Nachricht an zuständige Stelle" msgid "Assign to subdivision:" msgstr "An Fachbereich zuweisen" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "User an Gegenden zuweisen" @@ -462,12 +492,17 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Rückmeldung an User" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "Rückmeldung an User" @@ -475,18 +510,10 @@ msgstr "Rückmeldung an User" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "Verhindern Sie persönliche Informationen wie Kfz-Kennzeichen oder Personen" @@ -500,20 +527,21 @@ msgstr "Überprüfung ausstehend" msgid "Back" msgstr "Zurück" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "Alle Meldungen" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "" +#, fuzzy +msgid "Ban user" +msgstr "User hinzufügen" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Externe Adressen" @@ -524,14 +552,10 @@ msgstr "Externe Adressen" msgid "Body" msgstr "Organisation" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Organisation" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -544,8 +568,9 @@ 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:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Kategorie" @@ -556,30 +581,36 @@ msgstr "Kategorie:" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategorie" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategorie von ‘%s’ nach ‘%s’ geändert" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -587,17 +618,17 @@ msgstr "" msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategorie: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "E-Mail Adresse ändern" @@ -605,10 +636,16 @@ msgstr "E-Mail Adresse ändern" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Passwort ändern" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "Ihre Telefonnummer" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -630,19 +667,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Schaden lokalisieren" @@ -671,18 +703,19 @@ msgstr "Klicken Sie auf den Link im Bestätigungsemail um sich anzumelden." #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Beantwortet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "" @@ -697,16 +730,17 @@ msgid "Cobrand" msgstr "" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -714,7 +748,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -723,7 +757,7 @@ msgstr "" msgid "Confirm" msgstr "Bestätigen" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Account bestätigen" @@ -742,14 +776,10 @@ msgstr "Bestätigung" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Bestätigt" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -776,8 +806,8 @@ msgstr "" msgid "Coordinates:" msgstr "Koordinaten" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "" @@ -795,43 +825,16 @@ msgstr "" msgid "Council contacts for %s" msgstr "Kontaktdetails von %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Anzahl" @@ -853,39 +856,44 @@ msgstr "Kategorie erstellen" msgid "Create priority" msgstr "Priorität erstellen" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Vorlage erstellen" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Erstellt" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Erstellt" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Aktueller Status" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -896,14 +904,14 @@ msgstr "Bisher wurden noch keine Organisationseinheiten erfasst." msgid "Customer not contactable" msgstr "Kunde nicht kontaktierbar" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Innerhalb von fünf Arbeitstagen abgeschlossen" @@ -916,12 +924,12 @@ msgstr "" msgid "Default priority" msgstr "Priorität erstellen" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Vorlage löschen" @@ -932,8 +940,8 @@ msgstr "Vorlage löschen" msgid "Deleted" msgstr "Gelöscht" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -949,6 +957,10 @@ msgstr "Beschreibung" msgid "Description:" msgstr "Beschreibung" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -961,6 +973,10 @@ msgstr "Beschreibung" msgid "Details:" msgstr "Beschreibung" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "" @@ -974,8 +990,8 @@ msgstr "hat Karte nicht verwendet" msgid "Diligency prize league table" msgstr "Weiss ich nicht" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -984,7 +1000,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -992,7 +1008,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "Haben Sie ein %s Passwort?" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1012,11 +1028,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "Fotos hierhin ziehen oder hochladen" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1036,9 +1052,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Anpassen" @@ -1048,33 +1065,33 @@ msgstr "Anpassen" msgid "Edit body details" msgstr "Details editieren" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "User-Details editieren" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "Kategorie editieren" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "Priorität editieren" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "Meldungen editieren" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Meldung %d bearbeiten" @@ -1095,7 +1112,6 @@ msgstr "" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1103,17 +1119,20 @@ msgstr "" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "Ihre E-Mail Adresse" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Ihre E-Mail Adresse" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "E-Mail Benachrichtigung erstellt" @@ -1122,19 +1141,18 @@ msgstr "E-Mail Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail Benachrichtigung gelöscht" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "E-mail:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "E-mail:" @@ -1147,16 +1165,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/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +msgid "End Date" msgstr "" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1177,14 +1195,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Ungefähre Adresse des Schadens" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Ungefähre Adresse des Schadens" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Ihr Passwort" @@ -1202,8 +1220,8 @@ msgstr "Beschreiben Sie den Schaden" msgid "Error" msgstr "Fehler" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Alles" @@ -1228,7 +1246,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1244,7 +1262,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1256,7 +1274,7 @@ msgstr "Externe Stelle" msgid "External team" msgstr "Externes Team" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1268,7 +1286,7 @@ msgstr "Zusätzliche Details" msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "Zusätzliche Details" @@ -1298,21 +1316,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Beantwortet" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Als gelöscht markieren" @@ -1320,7 +1339,7 @@ msgstr "Als gelöscht markieren" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "" @@ -1329,7 +1348,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1337,8 +1356,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "" @@ -1358,7 +1377,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1378,8 +1397,12 @@ msgstr "Wunsch an externe Stelle weitergeleitet" msgid "Frequently Asked Questions" msgstr "Hilfe" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1412,12 +1435,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Los" @@ -1425,7 +1448,7 @@ msgstr "Los" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1433,6 +1456,14 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Grafik der Meldungen nach Status und Zeit" +#: templates/web/base/dashboard/index.html:93 +msgid "Group by %s" +msgstr "" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "" @@ -1453,21 +1484,26 @@ msgstr "Hilfe" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "Helfen Sie %s Ihre Meldung zu bearbeiten indem Sie zusätzliche Informationen angeben." +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Fotos von neuen Meldungen in der Nähe" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hallo %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Unsichtbar" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1488,21 +1524,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Alte ausblenden" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Stecknadeln ausblenden" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1514,7 +1547,7 @@ msgstr "" msgid "History" msgstr "History" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "" @@ -1571,12 +1604,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1585,7 +1626,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1594,7 +1635,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1666,11 +1707,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "Persönliche Angaben des Meldenden mitsenden" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1682,7 +1719,7 @@ msgstr "" msgid "Inspection required" msgstr "Kontrolle notwendig" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1694,26 +1731,18 @@ msgstr "Interne Notizen" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Ung&ultiges Enddatum" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Ung&ultiges Startdatum" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1732,7 +1761,7 @@ msgstr "Zuständigkeit unbekannt" msgid "Jurisdiction unknown" msgstr "Zuständigkeit unbekannt" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1757,12 +1786,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1788,18 +1812,14 @@ msgstr "Letzte Bearbeitung" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "Älteste Bearbeitung" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1808,13 +1828,13 @@ msgstr "" msgid "List all reported problems" msgstr "Liste aller Meldungen" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "" #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1846,12 +1866,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1859,11 +1882,11 @@ msgstr "" msgid "MAP" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1875,11 +1898,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1899,45 +1922,45 @@ msgstr "Nachricht an zuständige Stelle" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "Meldungsdetails anpassen" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "Meldung anpassen" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Innerhalb eines Arbeitstages moderiert" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Monat" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "Am meisten kommentiert" @@ -1955,9 +1978,9 @@ msgstr "Am meisten kommentiert" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1968,19 +1991,24 @@ msgstr "Name" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Name:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Name: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "Zu dieser Meldung zoomen" +#: templates/web/base/report/_inspect.html:39 +#, fuzzy +msgid "Nearest calculated address:" +msgstr "Neue E-Mail Adresse" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1990,12 +2018,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2009,20 +2037,25 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "Fast Fertig! Bitte checken Sie Ihre Mailbox…" +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "Fast Fertig! Bitte checken Sie Ihre Mailbox…" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 #, fuzzy msgid "New" msgstr "Neueste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Neue Organisation hinzugefügt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "Neue E-Mail Adresse" @@ -2043,6 +2076,11 @@ msgstr "Neue Nachricht an die Kommunikation" msgid "New password:" msgstr "Neues Passwort" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "Ihre Telefonnummer" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2072,18 +2110,19 @@ msgstr "" msgid "New reports" msgstr "Neu" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Neuer Status" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Neue Vorlage" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "Neueste" @@ -2091,7 +2130,7 @@ msgstr "Neueste" msgid "Next" msgstr "Weiter" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2103,22 +2142,18 @@ msgstr "Weiter" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Nein" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "" @@ -2148,6 +2183,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "" @@ -2170,15 +2209,15 @@ msgstr "" msgid "None" msgstr "Keine" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2197,7 +2236,7 @@ msgstr "Nicht kontaktierbar" msgid "Not for my subdivision" msgstr "Anderer Fachbereich zuständig" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "" @@ -2211,10 +2250,6 @@ msgstr "" msgid "Note" msgstr "" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2242,37 +2277,46 @@ msgstr "" msgid "Now to submit your update…" msgstr "" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Alter Status" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "Älteste" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2312,23 +2356,29 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +msgid "Other wards" +msgstr "" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2346,19 +2396,19 @@ msgstr "" msgid "Parent" msgstr "Gehört zu" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Passwort" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "" @@ -2366,7 +2416,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2375,19 +2425,25 @@ msgstr "" msgid "Phone Reporter:" msgstr "Gemeldet" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Gemeldet" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefonnummer:" @@ -2403,7 +2459,7 @@ msgstr "Telefonnummer:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2429,12 +2485,17 @@ msgstr "Fotos" msgid "Photos of recent nearby reports" msgstr "Fotos von neuen Meldungen in der Nähe" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Pin auf der Karte absetzen" @@ -2456,25 +2517,34 @@ msgstr "Bitte seien Sie freundlich und prägnant." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2489,39 +2559,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Obligatorisches Feld" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "Obligatorisches Feld" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Obligatorisches Feld" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" @@ -2530,55 +2608,62 @@ msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Obligatorisches Feld" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Bitte geben Sie einige Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Ihre E-Mail Adresse" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Ihre E-Mail Adresse" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Namen an" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Obligatorisches Feld" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Bitte geben Sie Ihren Namen an" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Bitte geben Sie Ihre E-Mail-Adresse an" @@ -2627,7 +2712,11 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +msgid "Please provide a duplicate ID or public update for this report." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2667,6 +2756,11 @@ msgstr "" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "" @@ -2676,7 +2770,7 @@ msgid "Please write your update here" msgstr "" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2685,15 +2779,15 @@ msgstr "" msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "" @@ -2705,11 +2799,11 @@ msgstr "" msgid "Previous" msgstr "Zurück" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2726,7 +2820,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "" @@ -2750,21 +2844,21 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Meldungen" @@ -2791,7 +2885,7 @@ msgstr "Meldungen, welche kürzlich beantwortet wurden" msgid "Problems within %.1fkm of %s" msgstr "Meldungen innerhalb %s, %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2817,7 +2911,8 @@ msgstr "Meldungen innerhalb %s, %s" msgid "Property address:" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Meldung aktualisieren" @@ -2826,12 +2921,12 @@ msgstr "Meldung aktualisieren" msgid "Provide update as" msgstr "Meldung aktualisieren als" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2844,12 +2939,12 @@ msgstr "" msgid "Public response:" msgstr "Rückmeldung an User" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "Rückmeldung an User" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Foto veröffentlichen" @@ -2904,7 +2999,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2929,7 +3024,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2943,7 +3038,7 @@ msgstr "Kürzlich erfasste Meldungen, %s" msgid "Recently reported problems" msgstr "Kürzlich erfasste Meldungen:" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "Neueste Bearbeitung" @@ -2965,9 +3060,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2975,12 +3070,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "Antwort an User" @@ -3009,11 +3108,11 @@ msgstr "Missbrauch melden" msgid "Report as" msgstr "Melden als" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3028,17 +3127,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Melden Sie Schäden an der Infrastruktur von Zürich" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -3052,27 +3151,27 @@ msgstr "Gemeldet von" msgid "Reported in the %s category" msgstr "In der Kategorie %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "In der Kategorie %s um %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3081,8 +3180,8 @@ msgstr "" msgid "Reported:" msgstr "Gemeldet" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3090,10 +3189,9 @@ msgstr "Gemeldet" msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Meldungen" @@ -3110,7 +3208,7 @@ msgstr "Rückmeldung ausstehend" msgid "Reports by destination" msgstr "Gemeldet von %s um %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3122,7 +3220,7 @@ msgstr "" msgid "Reports published" msgstr "Beantwortet" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3177,21 +3275,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "Vorlagen für %s" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3210,17 +3309,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Rechts drehen" @@ -3230,21 +3329,21 @@ 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:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3255,12 +3354,12 @@ msgstr "Speichern" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3278,7 +3377,7 @@ msgstr "Meldungen suchen" msgid "Search Users" msgstr "User suchen" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Meldungen suchen" @@ -3289,6 +3388,7 @@ msgid "Search:" msgstr "Suchen:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3301,7 +3401,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3310,8 +3410,8 @@ msgstr "" msgid "Select a body" msgstr "Organisation wählen" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Gebiet wählen" @@ -3331,11 +3431,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "Meldung zurückgewiesen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "" @@ -3344,11 +3449,11 @@ msgid "Sent:" msgstr "Gesendet:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Gerät" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3357,9 +3462,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3367,19 +3472,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3387,40 +3492,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Zeige Stecknadeln" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3431,12 +3533,16 @@ msgstr "Anmelden" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Ausloggen" @@ -3452,7 +3558,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "" @@ -3465,15 +3571,20 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "Entschuldigung, dieser Link ist ungültig" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "Entschuldigung, dieser Link ist ungültig" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3506,20 +3617,20 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "Sortieren nach" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +msgid "Start Date" msgstr "" #: templates/web/base/admin/body.html:73 @@ -3529,15 +3640,18 @@ msgstr "" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Status" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Speichern" @@ -3551,17 +3665,19 @@ msgstr "Speichern" msgid "State:" msgstr "Status" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Status" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistik" @@ -3571,7 +3687,7 @@ msgstr "Statistik" msgid "Status" msgstr "" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "" @@ -3584,7 +3700,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Kategorie" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "" @@ -3601,18 +3722,19 @@ msgstr "Titel" msgid "Subject:" msgstr "Titel" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Abschicken" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3653,7 +3775,7 @@ msgstr "" msgid "Summarise your changes" msgstr "Fassen Sie Ihre Änderungen zusammen" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3661,25 +3783,31 @@ msgstr "Fassen Sie Ihre Änderungen zusammen" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Zusammenfassung" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Alle Meldungen" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Alle Meldungen" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -3687,14 +3815,14 @@ msgstr "" msgid "Template «%s»" msgstr "Vorlage «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Vorlagen" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -3702,7 +3830,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3729,7 +3857,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" @@ -3745,7 +3873,7 @@ msgstr "" 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3755,11 +3883,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Die Meldung wurde als gesendet markiert." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "" @@ -3791,8 +3919,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3825,8 +3953,8 @@ msgstr "Bitte machen Sie so genaue Angaben wie möglich: Beschreiben Sie die msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "" @@ -3868,7 +3996,7 @@ msgstr "" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 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." @@ -3893,7 +4021,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3904,33 +4032,38 @@ msgid "" " Names are not necessarily unique." msgstr "Namen müssen nicht eindeutig sein." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Ihre E-Mail/Passwort Kombination war ungültig. Bitte versuchen Sie es erneut oder wenden Sie sich an den Administrator." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Ihre E-Mail/Passwort Kombination war ungültig. Bitte versuchen Sie es erneut oder wenden Sie sich an den Administrator." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3938,7 +4071,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "" @@ -3993,26 +4126,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Diese Information wird benötigt" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4029,7 +4170,7 @@ msgstr "Dieser Schaden wurde nicht behoben" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4039,23 +4180,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Überprüfung ausstehend" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4066,7 +4207,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "Aufwand (in Minuten)" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4078,20 +4219,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Titel" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Titel" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Geben Sie Ihre Adresse an, um über Meldungen in Ihrer Nähe informiert zu werden" @@ -4103,44 +4245,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Total" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Total" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4153,18 +4287,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "Vertrauenswürdig" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Erneut versuchen" @@ -4179,7 +4314,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4188,15 +4327,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Unbestätigt" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "Offene Meldungen" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Unbekannt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -4206,13 +4341,14 @@ msgstr "" msgid "Unknown error" msgstr "Unbekannter Fehler" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4237,12 +4373,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Speichern" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4250,16 +4386,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -4273,19 +4409,19 @@ msgstr "" msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "%s Meldungen Total" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4293,7 +4429,7 @@ msgid "Updated!" msgstr "Aktualisiert!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Antwort" @@ -4340,40 +4476,77 @@ msgstr "Karte verwendet" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +msgid "User added to abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +msgid "User already in abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +msgid "User in abuse table" msgstr "" #: templates/web/base/admin/users.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." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +msgid "User:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Neue E-Mail Adresse" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Ihre Telefonnummer" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4395,12 +4568,7 @@ msgstr "Meldung erfassen" msgid "Viewing a problem" msgstr "Meldung anschauen" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4410,20 +4578,25 @@ msgstr "" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Ihre Anfrage ergab mehr als eine mögliche Adresse. Die ersten zehn Treffer werden unten aufgelistet." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Diese Adresse wurde nicht gefunden." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "" @@ -4431,6 +4604,12 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Ihre Anfrage ergab mehr als eine mögliche Adresse. 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." @@ -4440,8 +4619,8 @@ msgstr "Ihre persönlichen Angaben werden nur für interne Zwecke verwen msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4469,7 +4648,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4492,6 +4671,10 @@ msgstr "Wunsch" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4508,16 +4691,7 @@ msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unle msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Jahr" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4532,7 +4706,7 @@ msgstr "Jahr" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Ja" @@ -4545,7 +4719,7 @@ msgstr "" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4562,7 +4736,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:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4588,7 +4762,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4596,7 +4770,7 @@ msgstr "" 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:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4623,18 +4797,38 @@ msgstr "Sie haben sich abgemeldet" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Der grüne Punkt lokalisiert Ihre Meldung auf der Karte. Falls dieser Ort nicht stimmt, kann der Pin verschoben werden." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Sie haben Ihre Meldung erfolgreich bestätigt. " + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Sie haben Ihre Meldung erfolgreich bestätigt. " +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Sie haben Ihre Meldung erfolgreich bestätigt. " + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Sie haben Ihre Meldung erfolgreich bestätigt. " + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Sie haben Ihre Meldung erfolgreich bestätigt. " + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4658,36 +4852,43 @@ msgid "Your Reports" msgstr "Ihre Meldungen" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "Ihr Account" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "E-Mail Adresse" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Ihre E-Mail Adresse" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Ihre E-Mail Adresse" + #: 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." -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4698,19 +4899,19 @@ msgstr "Ihr Name" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4721,8 +4922,8 @@ msgstr "Ihr Passwort" msgid "Your password has been changed" msgstr "Ihr Passwort wurde geändert" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -4731,7 +4932,7 @@ msgstr "Ihre Telefonnummer" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Ihre Meldungen" @@ -4740,25 +4941,40 @@ msgstr "Ihre Meldungen" msgid "Your shortlist" msgstr "Ihre Favoriten" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Ihr Passwort wurde geändert" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "Sie selbst" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4775,8 +4991,8 @@ msgstr "" msgid "didn't use map" msgstr "hat Karte nicht verwendet" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "z.B. ‘%s’ oder ‘%s’" @@ -4799,22 +5015,23 @@ msgstr "letzte Bearbeitung %s" msgid "less than a minute" msgstr "weniger als einer Minute" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "oder automatisch lokalisieren" @@ -4855,7 +5072,7 @@ msgstr "Es wird keine Stecknadel angezeigt, da der User die Karte nicht benü msgid "this location" msgstr "Meldung erfassen" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4863,11 +5080,11 @@ msgstr "" msgid "today" msgstr "heute" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4875,14 +5092,22 @@ msgstr "" msgid "used map" msgstr "Karte verwendet" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "Der User ist der Eigner der Meldung" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +msgid "user not in abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +msgid "user removed from abuse list" +msgstr "" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4944,35 +5169,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5042,6 +5267,21 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "Hide old" +#~ msgstr "Alte ausblenden" + +#~ msgid "Invalid end date" +#~ msgstr "Ung&ultiges Enddatum" + +#~ msgid "Invalid start date" +#~ msgstr "Ung&ultiges Startdatum" + +#~ msgid "Unfixed reports" +#~ msgstr "Offene Meldungen" + +#~ msgid "Year" +#~ msgstr "Jahr" + #~ msgid "Closed reports" #~ msgstr "Abgeschlossene Meldungen" diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po index a73a275bc4f..c124a0ca96e 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: German (Germany) (https://www.transifex.com/mysociety/teams/12067/de_DE/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "und" @@ -32,6 +32,10 @@ msgstr "und" msgid " or " msgstr "oder" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d bearbeitet von %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s Aktualisierungen in Echtzeit" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s Fragebögen versandt – %s beantwortet (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s Fragebögen versandt – %s beantwortet (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© OpenStreetMap-Beitragende" @@ -99,11 +108,6 @@ msgstr "© OpenStreetMap< msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -138,7 +142,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -159,8 +163,8 @@ msgstr "(gesendet an beide)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" @@ -173,14 +177,6 @@ msgstr "--Wählen Sie eine Vorlage aus--" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "14-30 Tage alt" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "7-14 Tage alt" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -189,16 +185,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "%s gespeichert." @@ -207,33 +203,49 @@ msgstr "%s gespeichert." msgid "%s live problems" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my report by email/text" +msgstr "" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my update by email/text" +msgstr "" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +msgid "No let me sign in by email or text" +msgstr "" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Ja, ich habe ein Passwort" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -247,11 +259,17 @@ msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Ihre eMail-Adresse" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -274,11 +292,17 @@ msgstr "Füge neue Kategorie hinzu" msgid "Add option" msgstr "optional" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Keine Telefonnummer)" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -288,23 +312,23 @@ msgstr "" msgid "Add user" msgstr "Benutzer hinzufügen" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "%s hinzugefügt" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -328,9 +352,10 @@ msgstr "Alarm %d deaktiviert (erstellt %s)" msgid "Alert me to future updates" msgstr "" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "Alle" @@ -339,12 +364,13 @@ msgstr "Alle" msgid "All Reports" msgstr "Alle Meldungen" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Alle Berichte als CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Alle Kategorien" @@ -360,17 +386,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alle Meldungen" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Alle Berichte zwischen %s und %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -408,7 +434,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Sind Sie sicher?" @@ -419,7 +446,7 @@ msgstr "Sind Sie sicher?" msgid "Area covered" msgstr "Gebiet abgedeckt" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "Gebiet:" @@ -433,7 +460,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "" @@ -445,7 +472,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -461,12 +488,17 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Nicht verantwortlich" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -474,18 +506,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -499,20 +523,21 @@ msgstr "Wartet auf Moderation" msgid "Back" msgstr "Zurück" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "" +#, fuzzy +msgid "Ban user" +msgstr "Benutzer hinzufügen" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "" @@ -523,14 +548,10 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Nach Datum" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -543,8 +564,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Kategorien" @@ -555,30 +577,36 @@ msgstr "Kategorien:" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategorie" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -586,17 +614,18 @@ msgstr "" msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategorie: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "E-Mail ändern" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "E-Mail-Adresse ändern" @@ -604,10 +633,16 @@ msgstr "E-Mail-Adresse ändern" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Passwort ändern" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Keine Telefonnummer)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -629,19 +664,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klicken Sie in die Karte um eine Meldung zu erfassen" @@ -669,18 +699,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Geschlossen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "" @@ -695,16 +726,17 @@ msgid "Cobrand" msgstr "" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -712,7 +744,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" @@ -721,7 +753,7 @@ msgstr "Konfiguration" msgid "Confirm" msgstr "Bestätigen" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Konto bestätigen" @@ -740,14 +772,10 @@ msgstr "Bestätigung" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Bestätigt" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Bestätigte Berichte zwischen %s und %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -774,8 +802,8 @@ msgstr "Kontaktieren Sie das Team" msgid "Coordinates:" msgstr "Koordinaten:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Benutzer konnte nicht gefunden werden" @@ -793,43 +821,16 @@ msgstr "Rat" msgid "Council contacts for %s" msgstr "" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Rat:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Anzahl" @@ -851,39 +852,44 @@ msgstr "Kategorie erstellen" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Vorlage erstellen" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Erstellt" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Erstellt:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Aktueller Status" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -894,14 +900,14 @@ msgstr "" msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Übersichtsseite" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -914,12 +920,12 @@ msgstr "" msgid "Default priority" msgstr "Neue Priorität" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Vorlage löschen" @@ -930,8 +936,8 @@ msgstr "Vorlage löschen" msgid "Deleted" msgstr "Gelöscht" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -947,6 +953,10 @@ msgstr "Beschreibung" msgid "Description:" msgstr "Beschreibung:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -959,6 +969,10 @@ msgstr "Beschreibung" msgid "Details:" msgstr "Beschreibung:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "" @@ -972,8 +986,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "Weiss ich nicht" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "Änderungen verwerfen" @@ -982,7 +996,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -990,7 +1004,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "Haben Sie ein %s-Passwort?" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1010,11 +1024,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1034,9 +1048,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Bearbeiten" @@ -1046,33 +1061,33 @@ msgstr "Bearbeiten" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Problem %d wird bearbeitet" @@ -1093,7 +1108,6 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1101,17 +1115,20 @@ msgstr "Editor" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "E-Mail-Adresse" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "E-Mail-Adresse" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "E-Mail-Benachrichtigung erstellt" @@ -1120,19 +1137,18 @@ msgstr "E-Mail-Benachrichtigung erstellt" msgid "Email alert deleted" msgstr "E-Mail-Benachrichtigung gelöscht" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "E-Mail:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "E-Mail: %s" @@ -1145,16 +1161,17 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Enddatum:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1175,14 +1192,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Geben Sie eine Adresse an" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Geben Sie eine Adresse an" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Geben Sie ein Passwort ein" @@ -1200,8 +1217,8 @@ msgstr "Beschreiben sie den Mangel" msgid "Error" msgstr "Fehler" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Alles" @@ -1226,7 +1243,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "Als CSV exportieren" @@ -1242,7 +1259,7 @@ msgstr "Extern" msgid "External ID" msgstr "Externe Kennung" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "Externe URL" @@ -1254,7 +1271,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1266,7 +1283,7 @@ msgstr "Zusätzliche Daten:" msgid "Extra data:" msgstr "Zusätzliche Daten:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1296,21 +1313,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Gelöst" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "" @@ -1318,7 +1336,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "" @@ -1327,7 +1345,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1335,8 +1353,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "" @@ -1356,7 +1374,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1376,8 +1394,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Häufig gestellte Fragen" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1410,12 +1432,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Los" @@ -1423,7 +1445,7 @@ msgstr "Los" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1431,6 +1453,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "von %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "" @@ -1451,21 +1482,26 @@ msgstr "Hilfe" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Fotos von neuen Meldungen in der Nähe" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hallo %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Unsichtbar" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1486,21 +1522,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Alte ausblenden" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Stecknadeln ausblenden" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1512,7 +1545,7 @@ msgstr "" msgid "History" msgstr "History" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "" @@ -1569,12 +1602,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1583,7 +1624,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1592,7 +1633,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1664,11 +1705,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Unbestätigte Berichte miteinbeziehen" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1680,7 +1717,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1692,26 +1729,18 @@ msgstr "Interne Hinweise" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Ung&ultiges Enddatum" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Ungültiges Format %s angegeben." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Ung&ultiges Startdatum" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1730,7 +1759,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1755,12 +1784,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "Letzte 4 Wochen" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "Letzte 7 Tage" @@ -1786,18 +1810,14 @@ msgstr "Letzte Aktualisierung:" msgid "Latitude/Longitude:" msgstr "Breitengrad/Längengrad:" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "Weniger als 7 Tage alt" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1806,13 +1826,13 @@ msgstr "" msgid "List all reported problems" msgstr "Liste aller Meldungen" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Lade..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1844,12 +1864,16 @@ msgstr "Mit Facebook anmelden" msgid "Log in with Twitter" msgstr "Mit Twitter anmelden" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "Mit E-Mail anmelden" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +#, fuzzy +msgid "Log in with email/text" +msgstr "Mit E-Mail anmelden" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1857,11 +1881,11 @@ msgstr "" msgid "MAP" msgstr "KARTE" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1873,11 +1897,11 @@ msgstr "Karte" msgid "Mark as sent" msgstr "Als gesendet markieren" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1897,45 +1921,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Fehlendes jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Monat" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "Meistkommentiert" @@ -1953,9 +1977,9 @@ msgstr "Meistkommentiert" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1966,19 +1990,23 @@ msgstr "Name" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Name:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Name: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1988,12 +2016,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2007,20 +2035,24 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 #, fuzzy msgid "New" msgstr "Neueste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2041,6 +2073,11 @@ msgstr "" msgid "New password:" msgstr "Neues Passwort:" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Keine Telefonnummer)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2070,18 +2107,19 @@ msgstr "" msgid "New reports" msgstr "Neue Berichte" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Neuer Status" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Neue Vorlage" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "Neueste" @@ -2089,7 +2127,7 @@ msgstr "Neueste" msgid "Next" msgstr "Weiter" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2101,22 +2139,18 @@ msgstr "Weiter" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Nein" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Kein Gebiet" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Kein Rat" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Kein Rat ausgewählt" @@ -2146,6 +2180,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Kein Ergebnis zurückgegeben" @@ -2168,15 +2206,15 @@ msgstr "Keine Unterstützer" msgid "None" msgstr "Keine" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2195,7 +2233,7 @@ msgstr "Nicht kontaktierbar" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Nicht vorher berichtet" @@ -2209,10 +2247,6 @@ msgstr "" msgid "Note" msgstr "Anmerkung" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2240,37 +2274,46 @@ msgstr "" msgid "Now to submit your update…" msgstr "" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Alter Status" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "Älteste" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2310,23 +2353,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Andere" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "andere Gebiete:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2344,19 +2394,19 @@ msgstr "Seite nicht gefunden" msgid "Parent" msgstr "Übergeordnet" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Teilweise" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Passwort (optional)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Passwort:" @@ -2364,7 +2414,7 @@ msgstr "Passwort:" msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "Berechtigungen:" @@ -2373,19 +2423,25 @@ msgstr "Berechtigungen:" msgid "Phone Reporter:" msgstr "Gemeldet:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Gemeldet:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefonnummer:" @@ -2401,7 +2457,7 @@ msgstr "Telefonnummer:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2427,12 +2483,17 @@ msgstr "Fotos" msgid "Photos of recent nearby reports" msgstr "Fotos von neuen Meldungen in der Nähe" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Stecknadel auf Karte platzieren" @@ -2454,25 +2515,34 @@ msgstr "Bitte seien Sie freundlich und prägnant." msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Bitte überprüfen Sie ob Ihre eMail-Adresse korrekt ist" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Bitte korrigieren Sie die Fehler unten" @@ -2487,39 +2557,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Bitte geben Sie eine Nachricht ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Bitte geben Sie Ihre Telefonnummer ein" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "Bitte geben Sie Ihren Namen ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Bitte geben Sie ein Passwort ein" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Bitte geben Sie einen Betreff ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Bitte geben Sie eine gültige eMail-Adresse an" @@ -2528,55 +2606,62 @@ msgstr "Bitte geben Sie eine gültige eMail-Adresse an" msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige eMail-Adresse an" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Bitte geben Sie Ihre Telefonnummer ein" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Bitte geben Sie einiges Details an" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Bitte geben Sie Ihre eMail-Adresse an" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Bitte geben Sie eine Ihre eMail-Adresse an" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Vornamen ein" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Bitte geben Sie Ihren Namen an" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Bitte geben Sie Ihre Telefonnummer ein" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Bitte geben Sie Ihren zweiten Vornamen ein" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Bitte geben Sie Ihren Titel ein" @@ -2625,7 +2710,11 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +msgid "Please provide a duplicate ID or public update for this report." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2665,6 +2754,11 @@ msgstr "" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Bitte schreiben Sie eine Nachricht" @@ -2674,7 +2768,7 @@ msgid "Please write your update here" msgstr "Bitte schreiben Sie hier Ihre Aktualisierung" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2683,15 +2777,15 @@ msgstr "" msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "" @@ -2703,11 +2797,11 @@ msgstr "" msgid "Previous" msgstr "Vorherige" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "Prioritäten" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "Priorität" @@ -2724,7 +2818,7 @@ msgstr "Datenschutz und Cookies" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privat" @@ -2748,21 +2842,21 @@ msgstr "Problem %s bestätigt" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problem als offen markiert." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Meldungen" @@ -2789,7 +2883,7 @@ msgstr "Meldungen, welche kürzlich gelöst wurden" msgid "Problems within %.1fkm of %s" msgstr "Meldungen innerhalb %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2815,7 +2909,8 @@ msgstr "" msgid "Property address:" msgstr "Immobilien-Adresse:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Meldung aktualisieren" @@ -2824,12 +2919,12 @@ msgstr "Meldung aktualisieren" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2842,12 +2937,12 @@ msgstr "Öffentliche Details" msgid "Public response:" msgstr "Öffentliche Antwort:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "Öffentliche Aktualisierung:" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Foto veröffentlichen" @@ -2902,7 +2997,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2927,7 +3022,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "Erhalten Sie Aktualisierungen dieser Meldung." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2941,7 +3036,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Kürzlich erfasste Meldungen" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2964,9 +3059,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2974,12 +3069,16 @@ msgstr "" msgid "Remove from site" msgstr "Von Seite entfernen" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Foto entfernen (kann nicht rückgängig gemacht werden!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3008,11 +3107,11 @@ msgstr "Missbrauch melden" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Bericht auf %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3027,17 +3126,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Melden sie Mängel an der Infrastruktur von Zürich" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Anonym gemeldet um" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Vorher berichtet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Gemeldet von %s um %s" @@ -3051,27 +3150,27 @@ msgstr "Gemeldet von:" msgid "Reported in the %s category" msgstr "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeldet von %s um %s" @@ -3080,8 +3179,8 @@ msgstr "Gemeldet von %s um %s" msgid "Reported:" msgstr "Gemeldet:" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3089,10 +3188,9 @@ msgstr "Gemeldet:" msgid "Reporting a problem" msgstr "Verfassen Sie eine Meldung" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Berichte" @@ -3109,7 +3207,7 @@ msgstr "Berichte warten auf Moderation" msgid "Reports by destination" msgstr "Gemeldet von %s um %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3121,7 +3219,7 @@ msgstr "" msgid "Reports published" msgstr "Berichte veröffentlicht" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3176,21 +3274,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3209,17 +3308,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Nach links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Nach rechts drehen" @@ -3229,21 +3328,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satellit" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3254,12 +3353,12 @@ msgstr "Änderungen speichern" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3278,7 +3377,7 @@ msgstr "Berichte suchen" msgid "Search Users" msgstr "Benutzer suchen" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Berichte suchen" @@ -3289,6 +3388,7 @@ msgid "Search:" msgstr "Suchen:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3301,7 +3401,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3310,8 +3410,8 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Wählen Sie ein Gebiet" @@ -3331,11 +3431,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "" @@ -3344,11 +3449,11 @@ msgid "Sent:" msgstr "Gesendet:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Dienst:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3357,9 +3462,9 @@ msgid "Share" msgstr "Teilen" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3367,19 +3472,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "Foto anzeigen?" @@ -3387,40 +3492,37 @@ msgstr "Foto anzeigen?" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Meinen Namen öffentlich anzeigen" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "Name öffentlich anzeigen?" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Alte anzeigen" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "Foto anzeigen" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Zeige Stecknadeln" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3431,12 +3533,16 @@ msgstr "Anmelden" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Melden Sie sich an oder erstellen Sie ein Konto" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Abmelden" @@ -3452,7 +3558,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "" @@ -3465,15 +3571,19 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3506,20 +3616,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Startdatum:" #: templates/web/base/admin/body.html:73 @@ -3529,15 +3640,18 @@ msgstr "Startdatum:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Status" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Änderungen speichern" @@ -3551,17 +3665,19 @@ msgstr "Änderungen speichern" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Status" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistiken" @@ -3571,7 +3687,7 @@ msgstr "Statistiken" msgid "Status" msgstr "Status" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "" @@ -3584,7 +3700,12 @@ msgstr "Straßenansicht" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Unterkategorie: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Unterkategorie: %s" @@ -3601,18 +3722,19 @@ msgstr "Titel" msgid "Subject:" msgstr "Titel:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Abschicken" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3654,7 +3776,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3662,25 +3784,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Zusammenfassung" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Zusammenfassungsberichte" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Zusammenfassungsberichte" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Umfrageergebnisse" @@ -3688,14 +3816,14 @@ msgstr "Umfrageergebnisse" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Vorlagen" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Text" @@ -3703,7 +3831,7 @@ msgstr "Text" msgid "Text only version" msgstr "Nur-Text-Version" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3730,7 +3858,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Vielen Dank für Ihre Rückmeldung" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" @@ -3746,7 +3874,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3756,11 +3884,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Das Problem wird jetzt erneut gesendet." @@ -3792,8 +3920,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3826,8 +3954,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Der Fehler war: %s" @@ -3869,7 +3997,7 @@ msgstr "" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3894,7 +4022,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3905,33 +4033,37 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Es gab ein Problem mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut." @@ -3939,7 +4071,7 @@ msgstr "Es gab ein Problem mit Ihrer Aktualisierung. Bitte versuchen Sie es erne msgid "There were problems with your report. Please see below." msgstr "Es gab ein Problem mit Ihrem Bericht. Bitte versuchen Sie es erneut." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Es gab Probleme mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut." @@ -3994,26 +4126,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Diese Information wird benötigt" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4030,7 +4170,7 @@ msgstr "Dieser Mangel wurde nicht behoben" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4040,23 +4180,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Dieser Bericht wartet auf Moderation." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Dieser Bericht ist aktuell als geschlossen markiert." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Dieser Bericht ist aktuell als behoben markiert." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Dieser Bericht ist aktuell als offen markiert." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Dieser Bericht wurde anonym abgesendet" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4067,7 +4207,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zeitleiste" @@ -4079,20 +4219,21 @@ msgstr "Tipps für perfekte Fotos" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Titel" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Titel:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" @@ -4104,44 +4245,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Total" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Total" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4154,18 +4287,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Erneut versuchen" @@ -4180,7 +4314,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4189,15 +4327,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Unbestätigt" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Unbekannt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Unbekannter Benachrichtigungstyp" @@ -4207,13 +4341,14 @@ msgstr "Unbekannter Benachrichtigungstyp" msgid "Unknown error" msgstr "Unbekannter Fehler" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Unbekannte Problemkennung" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4238,12 +4373,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4251,16 +4386,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "Aktualisierung von {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -4274,20 +4409,20 @@ msgstr "" msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Anmerkung: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Anmerkung: %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4295,7 +4430,7 @@ msgid "Updated!" msgstr "Aktualisiert!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Aktualisierungen" @@ -4342,40 +4477,78 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +msgid "User added to abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +msgid "User already in abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +msgid "User in abuse table" msgstr "" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Benutzer" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Benutzer" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Werte aktualisiert" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Ihre eMail-Adresse" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Ihre Telefonnummer" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4397,12 +4570,7 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4412,20 +4580,24 @@ msgstr "" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." +msgid "We found more than one match for that location." msgstr "" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "" @@ -4433,6 +4605,11 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4442,8 +4619,8 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4471,7 +4648,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4494,6 +4671,10 @@ msgstr "Wunsch" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4510,16 +4691,7 @@ msgstr "Meldungen gänzlich in Grossbuchstaben zu schreiben macht diese unle msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Jahr" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4534,7 +4706,7 @@ msgstr "Jahr" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Ja" @@ -4547,7 +4719,7 @@ msgstr "Ja, ich habe ein Passwort" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4564,7 +4736,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4590,7 +4762,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4598,7 +4770,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4625,18 +4797,38 @@ msgstr "Sie wurden abgemeldet" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Der gr¨ne Pin auf der Karte repräsentiert ihre Meldung. Falls dieser Ort nicht der Richtige ist, klicken Sie einfach nochmals am richtigen Ort auf die Karte." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Sie haben Ihre E-Mail-Adresse erfolgreich bestätigt." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Sie haben Ihre E-Mail-Adresse erfolgreich bestätigt." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Sie haben Ihre E-Mail-Adresse erfolgreich bestätigt." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Sie haben Ihre E-Mail-Adresse erfolgreich bestätigt." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Sie haben Ihre E-Mail-Adresse erfolgreich bestätigt." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4660,36 +4852,43 @@ msgid "Your Reports" msgstr "Ihre Berichte" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Ihre eMail" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Ihre eMail-Adresse" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Ihre eMail-Adresse" + #: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4700,19 +4899,19 @@ msgstr "Ihr Name" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4723,8 +4922,8 @@ msgstr "Ihr Passwort" msgid "Your password has been changed" msgstr "Ihr Passwort wurde geändert" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Ihre Telefonnummer" @@ -4733,7 +4932,7 @@ msgstr "Ihre Telefonnummer" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Ihre Meldungen" @@ -4742,25 +4941,40 @@ msgstr "Ihre Meldungen" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Ihr Passwort wurde geändert" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Ihre Aktualisierungen" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "alle" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4777,8 +4991,8 @@ msgstr "Rat" msgid "didn't use map" msgstr "hat Karte nicht verwendet" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "z.B. ‘%s’ oder ‘%s’" @@ -4801,22 +5015,23 @@ msgstr "zuletzt aktualisiert %s" msgid "less than a minute" msgstr "weniger als einer Minute" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n/v" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "keine" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "" @@ -4856,7 +5071,7 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4864,11 +5079,11 @@ msgstr "" msgid "today" msgstr "heute" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4876,14 +5091,23 @@ msgstr "" msgid "used map" msgstr "" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "Benutzer ist Problemeigentümer" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +msgid "user not in abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Von Seite entfernen" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4945,35 +5169,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5043,6 +5267,45 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "14-30 days old" +#~ msgstr "14-30 Tage alt" + +#~ msgid "7-14 days old" +#~ msgstr "7-14 Tage alt" + +#~ msgid "By Date" +#~ msgstr "Nach Datum" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Bestätigte Berichte zwischen %s und %s" + +#~ msgid "Hide old" +#~ msgstr "Alte ausblenden" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Unbestätigte Berichte miteinbeziehen" + +#~ msgid "Invalid end date" +#~ msgstr "Ung&ultiges Enddatum" + +#~ msgid "Invalid start date" +#~ msgstr "Ung&ultiges Startdatum" + +#~ msgid "Last 4 weeks" +#~ msgstr "Letzte 4 Wochen" + +#~ msgid "Less than 7 days old" +#~ msgstr "Weniger als 7 Tage alt" + +#~ msgid "No council" +#~ msgstr "Kein Rat" + +#~ msgid "Show old" +#~ msgstr "Alte anzeigen" + +#~ msgid "Year" +#~ msgstr "Jahr" + #~ msgid "%s ward, %s" #~ msgstr "%s Stadtteil, %s" @@ -5064,9 +5327,6 @@ msgstr[1] "" #~ msgid "No further action" #~ msgstr "Kann nicht behoben werden" -#~ msgid "Not Responsible" -#~ msgstr "Nicht verantwortlich" - #~ msgid "Please choose a property type" #~ msgstr "Bitte wählen Sie eine Eigentumsart" diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po index 05dc1f4dbfe..1b497c5eab1 100644 --- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Greek (Greece) (https://www.transifex.com/mysociety/teams/12067/el_GR/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "και" @@ -32,6 +32,10 @@ msgstr "και" msgid " or " msgstr "ή" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d επεξεργασίες από "%s"" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s επαφές υπηρεσίας – %s επιβεβαιωμένες, %s ανεπιβεβαίωτες" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -75,7 +79,7 @@ msgstr "" "τα προβλήματα σε μια ορισμένη ακτίνα απόστασης από κάποια τοποθεσία." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -91,6 +95,11 @@ msgstr "" msgid "%s live updates" msgstr "%s ζωντανές ενημερώσεις" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "στάλθηκαν %s ερωτηματολόγια – %s απαντήθηκαν (%s%%)" @@ -99,7 +108,7 @@ msgstr "στάλθηκαν %s ερωτηματολόγια – %s απαντ msgid "%s ref: %s" msgstr "%s αναφ.: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© OpenStreetMap και συνεργάτες" @@ -107,11 +116,6 @@ msgstr "© OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(Ελλάτωμα & τοποθεσία ελλατώματος)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(το email βρίσκεται στη μαύρη λίστα)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -147,7 +151,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(όπως graffiti, παρατημένα σκουπίδια, σπασμένες πλάκες πεζοδρομίου ή καμένα φώτα δρόμων)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -169,8 +173,8 @@ msgstr "(στάλθηκε και στις δύο)" msgid "(we also have RSS feeds for problems within %s)" msgstr "Ροή RSS για προβλήματα στο "%s"" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Διάλεξε κατηγορία --" @@ -183,14 +187,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -202,17 +198,17 @@ msgstr "" "Μάλλον γι'αυτό η κατηγορία \"περιοχή αρμοδιότητας\" είναι κενή (παρακάτω).
\n" "Μήπως να προσθέσετε μερικά MAPIT_TYPES στο αρχείο ρυθμίσεων;" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -221,33 +217,52 @@ msgstr "" msgid "%s live problems" msgstr "%s προβλήματα τώρα" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Όχι Να γίνει επιβεβαίωση της αναφοράς μέσω email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Όχι Να γίνει επιβεβαίωση της αναφοράς μέσω email" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Όχι Να γίνει επιβεβαίωση της ενημέρωσης μέσω email" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Όχι Να γίνει επιβεβαίωση της ενημέρωσης μέσω email" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Όχι να συνδεθώ μέσω email" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Όχι να συνδεθώ μέσω email" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Ναι έχω κωδικό πρόσβασης" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -263,11 +278,17 @@ msgid "Add a contact using the form below." msgstr "Πρόσθεσε μία επαφή χρησιμοποιώντας την παρακάτω φόρμα." #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Προσθήκη τομέα" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Αποκλεισμός της διεύθυνσης email" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -290,11 +311,17 @@ msgstr "Προσθήκη νέας κατηγορίας" msgid "Add option" msgstr "(προαιρετικό)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -304,23 +331,23 @@ msgstr "" msgid "Add user" msgstr "Προσθήκη χρήστη" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Προστέθηκε %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -344,9 +371,10 @@ msgstr "Η ειδοποίηση %d απενεργοποιήθηκε (δημιο msgid "Alert me to future updates" msgstr "Ειδοποίησέ με για μελλοντικές ενημερώσεις" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -355,12 +383,13 @@ msgstr "" msgid "All Reports" msgstr "Όλες οι Αναφορές" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Όλες οι Αναφορές ως CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -376,17 +405,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Όλες οι αναφορές" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Όλες οι αναφορές από %s μέχρι %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -424,7 +453,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "Είστε σίγουροι πως θέλετε να ακυρώσετε αυτή την μεταφόρτωση;" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -435,7 +465,7 @@ msgstr "" msgid "Area covered" msgstr "Περιοχή αρμοδιότητας" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -449,7 +479,7 @@ msgid "Assign to competent body:" msgstr "Ανάθεση στον αρμόδιο τομέα:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Ανάθεση σε διαφορετική κατηγορία:" @@ -461,7 +491,7 @@ msgstr "Ανάθεση σε εξωτερικό τομέα:" msgid "Assign to subdivision:" msgstr "Ανάθεση στο τμήμα:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -477,12 +507,17 @@ msgstr "Σε κάθε αναζήτηση επιστρέφονται το πολ msgid "At the moment only searching for and looking at reports work." msgstr "Αυτή τη στιγμή λειτουργούν μόνο η αναζήτηση και η προβολή αναφορών." -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Δεν είναι Υπεύθυνος" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -490,18 +525,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -515,20 +542,21 @@ msgstr "Σε αναμονή ελέγχου" msgid "Back" msgstr "Πίσω" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Αποκλεισμός της διεύθυνσης email" +#, fuzzy +msgid "Ban user" +msgstr "Επισήμανση χρήστη" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Τομείς" @@ -539,14 +567,10 @@ msgstr "Τομείς" msgid "Body" msgstr "Τομέας" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Τομέας:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Ανά ημερομηνία" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -559,8 +583,9 @@ msgstr "Δεν μπορείς να βρεις το email μας; Έλεγξε τ msgid "Can't see the map? Skip this step" msgstr "Δεν μπορείς να δεις τον χάρτη; Παράλειψη βήματος" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -571,30 +596,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Κατηγορία" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Κατηγορία" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "Μέσος όρος διόρθωσης προβλημάτων για την κατηγορία > 4 εβδομάδες" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -602,17 +633,17 @@ msgstr "Μέσος όρος διόρθωσης προβλημάτων για τ msgid "Category:" msgstr "Κατηγορία:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Κατηγορία: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -620,10 +651,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Αλλαγή κωδικού πρόσβασης" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Χωρίς αριθμό τηλεφώνου)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -650,19 +687,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Κάνε κλικ εδώ ή κάνε εισαγωγή με τη μορφή ηη/μμ/εεεε" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Κάνε κλικ στον χάρτη για να αναφέρεις ένα πρόβλημα" @@ -691,18 +723,19 @@ msgstr "Κάνε κλικ στον σύνδεσμο του email επιβεβα #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Κλειστό" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Κλειστό από την υπηρεσία" @@ -717,16 +750,17 @@ msgid "Cobrand" msgstr "Προστεθέν σήμα" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Δεδομένα προστεθέντος σήματος:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Προστεθέν σήμα:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -734,7 +768,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Ρυθμίσεις" @@ -743,7 +777,7 @@ msgstr "Ρυθμίσεις" msgid "Confirm" msgstr "Επιβεβαίωση" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Επιβεβαίωση λογαριασμού" @@ -762,14 +796,10 @@ msgstr "Επιβεβαίωση" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Επιβεβαιώθηκε" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Επιβεβαιωμένες αναφορές μεταξύ %s και %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -796,8 +826,8 @@ msgstr "Επικοινώνησε με την ομάδα διαχείρισης" msgid "Coordinates:" msgstr "Συντεταγμένες:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Δεν είναι δυνατή η εύρεση χρήστη" @@ -815,43 +845,16 @@ msgstr "Υπηρεσία" msgid "Council contacts for %s" msgstr "Επαφές υπηρεσίας για "%s"" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "υπηρεσία αναφ.: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Υπηρεσία:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Καταμέτρηση" @@ -873,39 +876,44 @@ msgstr "Δημιουργία κατηγορίας" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Δημιουργία προτύπου" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Δημιουργήθηκε" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Δημιουργήθηκε:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Κατάσταση" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -916,14 +924,14 @@ msgstr "Δεν έχουν δημιουργηθεί τομείς μέχρι στ msgid "Customer not contactable" msgstr "Δεν υπάρχει τρόπος επικοινωνίας με τον πελάτη" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Πίνακας Ελέγχου" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Εξετάστηκε από το τμήμα μέσα σε 5 εργάσιμες ημέρες" @@ -935,12 +943,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Διαγραφή προτύπου" @@ -951,8 +959,8 @@ msgstr "Διαγραφή προτύπου" msgid "Deleted" msgstr "Διαγραμμένα" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -968,6 +976,10 @@ msgstr "Περιγραφή" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -980,6 +992,10 @@ msgstr "Πληροφορίες" msgid "Details:" msgstr "Πληροφορίες:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Μεταβιβάστηκε" @@ -993,8 +1009,8 @@ msgstr "Δεν χρησιμοποιήθηκε ο χάρτης" msgid "Diligency prize league table" msgstr "Πίνακας βραβείων επιμέλειας" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -1003,7 +1019,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1011,7 +1027,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "Έχεις κωδικό πρόσβασης %s?" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1031,11 +1047,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "Σύρε φωτογραφίες εδώ ή κάνε κλικ για ανέβασμα" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1058,9 +1074,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Επεξεργασία" @@ -1070,33 +1087,33 @@ msgstr "Επεξεργασία" msgid "Edit body details" msgstr "Επεξεργασία λεπτομερειών του τομέα" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Γίνεται επεξεργασία του προβλήματος %d" @@ -1117,7 +1134,6 @@ msgstr "Επεξεργαστής" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1125,17 +1141,20 @@ msgstr "Επεξεργαστής" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Το Email προστέθηκε στην μαύρη λίστα" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Κωδικός πρόσβασης (προαιρετικό)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Η ειδοποίηση μέσω email δημιουργήθηκε" @@ -1144,19 +1163,18 @@ msgstr "Η ειδοποίηση μέσω email δημιουργήθηκε" msgid "Email alert deleted" msgstr "Η ειδοποίηση μέσω email διεγράφη" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Το Email είναι ήδη στην μαύρη λίστα" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Email: %s" @@ -1173,8 +1191,8 @@ msgstr "" "Για περισσότερες πληροφορίες δες\n" "αυτό το άρθρο." +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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" @@ -1184,8 +1202,9 @@ msgstr "" "διαφορετικό τελικό σημείο - endpoint - (και μέθοδο αποστολής) από αυτό του τομέα. Για παράδειγμα, όταν οι αναφορές από κάποια κατηγορία\n" "προβλημάτων πρέπει να σταλούν με email, ενώ κάποιες άλλες μπορούν να σταλούν με το Open311." -#: templates/web/base/admin/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Ημερομηνία Λήξης:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1206,14 +1225,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Γράψε έναν κοντινό ταχυδρομικό κώδικα, οδό ή περιοχή" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Γράψε μία κοντινή οδό ή περιοχή" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Γράψε ένα κωδικό πρόσβασης" @@ -1231,8 +1250,8 @@ msgstr "Γράψε λεπτομέρειες σχετικά με το πρόβλ msgid "Error" msgstr "Σφάλμα" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Τα πάντα" @@ -1257,7 +1276,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1273,7 +1292,7 @@ msgstr "Εξωτερικός" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "Εξωτερικός Σύνδεσμος" @@ -1285,7 +1304,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1297,7 +1316,7 @@ msgstr "Επιπλέον δεδομένα:" msgid "Extra data:" msgstr "Επιπλέον δεδομένα:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1327,21 +1346,22 @@ msgstr "Διόρθωσέ το επιλέγοντας μία περιοχ #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Διορθώθηκε" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Διορθώθηκε - Υπηρεσία" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Διορθώθηκε - Χρήστης" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Σήμανση ως διαγραμμένο" @@ -1349,7 +1369,7 @@ msgstr "Σήμανση ως διαγραμμένο" msgid "Flag user" msgstr "Επισήμανση χρήστη" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Επισημασμένα" @@ -1358,7 +1378,7 @@ msgstr "Επισημασμένα" msgid "Flagged reports and users" msgstr "Επισημασμένες αναφορές και χρήστες" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Οι επισημασμένοι χρήστες καταγράφονται στη σελίδα επισημασμένων." @@ -1366,8 +1386,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Επισημασμένοι:" @@ -1387,7 +1407,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Για περισσότερες πληροφορίες, δες Πώς το FixMyStreet χρησιμοποιεί το Mapit (στα Αγγλικά)." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1407,8 +1427,12 @@ msgstr "Η επιθυμία προωθήθηκε στον εξωτερικό τ msgid "Frequently Asked Questions" msgstr "Συχνές Ερωτήσεις" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1441,12 +1465,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Εμπρός" @@ -1454,7 +1478,7 @@ msgstr "Εμπρός" msgid "Going to send questionnaire?" msgstr "Σκοπεύεις να στείλεις ερωτηματολόγιο;" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1462,6 +1486,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Γράφημα της δημιουργίας προβλημάτων (κατάσταση προς χρόνος)" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "από %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Διορθώθηκε το πρόβλημα;" @@ -1482,21 +1515,26 @@ msgstr "Βοήθεια" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Φωτογραφίες από κοντινές και πρόσφατες αναφορές" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Γεια %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Κρυμμένα" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1517,21 +1555,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Απόκρυψη παλιών" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Απόκρυψη καρφιτσών" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1543,7 +1578,7 @@ msgstr "" msgid "History" msgstr "Ιστορικό" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Αρχική" @@ -1602,12 +1637,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Αν μάθεις περισσότερες πληροφορίες για την κατάσταση του προβλήματός σου, σε παρακαλούμε να επιστρέψεις στην ιστοσελίδα και να γράψεις μια σχετική ενημέρωση." @@ -1616,7 +1659,7 @@ msgstr "Αν μάθεις περισσότερες πληροφορίες για 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1625,7 +1668,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1699,11 +1742,7 @@ msgstr "Δεν έχετε νέα μηνύματα!" msgid "Include reporter personal details" msgstr "Να περιλαμβάνονται οι προσωπικές πληροφορίες του υποβολέα" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Να περιλαμβάνονται μη επιβεβαιωμένες αναφορές" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Εσφαλμένη τιμή has_photo \"%s\"" @@ -1715,7 +1754,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1727,26 +1766,18 @@ msgstr "Εσωτερικές οδηγίες" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Εσφαλμένη τιμή agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Λανθασμένη ημερομηνία λήξης" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Λανθασμένη μορφοποίηση %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Λανθασμένη ημερομηνία έναρξης" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "Συχνά είναι γρηγορότερο να ελέγξεις τις Συχνές Ερωτήσεις για να δεις αν η απάντηση που ψάχνεις βρίσκεται εκεί." @@ -1765,7 +1796,7 @@ msgstr "Άγνωστη δικαιοδοσία" msgid "Jurisdiction unknown" msgstr "Άγνωστη δικαιοδοσία" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1790,12 +1821,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1821,18 +1847,14 @@ msgstr "Τελευταία ενημέρωση:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1841,13 +1863,13 @@ msgstr "" msgid "List all reported problems" msgstr "Λίστα όλων των αναφερθέντων προβλημάτων" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Φορτώνει..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1879,12 +1901,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1892,11 +1917,11 @@ msgstr "" msgid "MAP" msgstr "ΧΑΡΤΗΣ" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1908,11 +1933,11 @@ msgstr "Χάρτης" msgid "Mark as sent" msgstr "Σημείωση ως απεσταλμένο" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Να επισημάνεις ως επισημασμένους τους χρήστες των οποίων τη συμπεριφορά θα ήθελες να παρακολουθείς." -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1932,45 +1957,45 @@ msgstr "Μήνυμα προς τον εξωτερικό τομέα:" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Λείπει το jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Ελέγχθηκε από το τμήμα μέσα σε μία εργάσιμη ημέρα" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Μήνας" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1988,9 +2013,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2001,19 +2026,23 @@ msgstr "Όνομα" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Όνομα:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Όνομα: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2023,12 +2052,12 @@ msgstr "Η οδός που βρίσκεται πλησιέστερα στην κ msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ο ταχυδρομικός κώδικας που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα): %s (%sm μακριά)" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Η οδός που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα από το Bing Maps): %s" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2044,19 +2073,24 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "Σχεδόν τελειώσαμε! Τώρα έλεγξε το email σου…" +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "Σχεδόν τελειώσαμε! Τώρα έλεγξε το email σου…" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Προστέθηκε νέος τομέας" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Προστέθηκε νέα επαφή κατηγορίας" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2077,6 +2111,11 @@ msgstr "Νέα σημείωση προς τον Διαχειριστή Παρο msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Χωρίς αριθμό τηλεφώνου)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2106,18 +2145,19 @@ msgstr "Νέα προβλήματα στα όρια του {{NAME}} στο FixMy msgid "New reports" msgstr "Νέες αναφορές" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Νέα κατάσταση" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Νέο πρότυπο" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2125,7 +2165,7 @@ msgstr "" msgid "Next" msgstr "Επόμενο" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2137,22 +2177,18 @@ msgstr "Επόμενο" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Όχι" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Κανένας τομέας" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Καμιά υπηρεσία" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Δεν επιλέχθηκε κάποια υπηρεσία" @@ -2182,6 +2218,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Δεν επιστράφηκαν αποτελέσματα." @@ -2204,15 +2244,15 @@ msgstr "Δεν υπάρχουν υποστηρικτές" msgid "None" msgstr "Κανένα" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2234,7 +2274,7 @@ msgstr "Δεν υπάρχει τρόπος επικοινωνίας" msgid "Not for my subdivision" msgstr "Δεν αφορά το τμήμα μου" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Δεν αναφέρθηκε στο παρελθόν" @@ -2248,10 +2288,6 @@ msgstr "Δεν αναφέρθηκε σε υπηρεσία" msgid "Note" msgstr "Σημείωση" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Όταν συμπεριλαμβάνουμε ανεπιβεβαίωτες αναφορές, χρησιμοποιούμε την ημερομηνία που δημιουργήθηκε η αναφορά, η οποία ενδέχεται να μην έγινε στον ίδιο μήνα που επιβεβαιώθηκε η αναφορά. Επομένως, οι αριθμοί ίσως είναι λίγο εκτός." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2279,37 +2315,46 @@ msgstr "Τώρα, για να υποβάλεις την αναφορά σου&he msgid "Now to submit your update…" msgstr "Τώρα, για να υποβάλεις την ενημέρωσή σου…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "ΟΚ" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Παλιά κατάσταση" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2348,23 +2393,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Άλλα" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "άλλες περιοχές:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2382,19 +2434,19 @@ msgstr "Η σελίδα δεν βρέθηκε" msgid "Parent" msgstr "Πηγή" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Εν μέρει" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Κωδικός πρόσβασης (προαιρετικό)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Νέος κωδικός πρόσβασης:" @@ -2402,7 +2454,7 @@ msgstr "Νέος κωδικός πρόσβασης:" msgid "Permalink" msgstr "Σύνδεσμος" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2411,19 +2463,25 @@ msgstr "" msgid "Phone Reporter:" msgstr "Αναφέρθηκε:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Αριθμός τηλεφώνου" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Αριθμός τηλεφώνου (προαιρετικό)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Αναφέρθηκε:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Τηλέφωνο:" @@ -2439,7 +2497,7 @@ msgstr "Τηλέφωνο:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2465,12 +2523,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Φωτογραφίες από κοντινές και πρόσφατες αναφορές" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Θέση της περιοχής στο χάρτη" @@ -2492,25 +2555,34 @@ msgstr "Παρακαλούμε να είσαι ευγενικός, συνοπτ msgid "Please check the passwords and try again" msgstr "Παρακαλούμε έλεγξε τους κωδικούς πρόσβασης και προσπάθησε πάλι." -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Παρακαλούμε έλεγξε αν η διεύθυνση email είναι σωστή" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Παρακαλούμε έλεγξε αν η διεύθυνση email είναι σωστή" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Παρακαλούμε επίλεξε μια κατηγορία" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Παρακαλούμε διόρθωσε τα παρακάτω λάθη" @@ -2528,39 +2600,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Παρακαλούμε να μην κάνεις κατάχρηση — η κατάχρηση της υπηρεσίας υποβαθμίζει την αξία της για όλους τους χρήστες." -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Παρακαλούμε γράψε ένα μήνυμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Παρακαλούμε γράψε τον αριθμό τηλεφώνου σου" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "Παρακαλώ γράψτε ένα όνομα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Παρακαλούμε γράψε έναν κωδικό πρόσβασης" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Παρακαλούμε γράψε ένα θέμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Παρακαλούμε γράψε ένα έγκυρο email" @@ -2569,55 +2649,62 @@ msgstr "Παρακαλούμε γράψε ένα έγκυρο email" msgid "Please enter a valid email address" msgstr "Παρακαλούμε γράψε μία έγκυρη διεύθυνση email" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Παρακαλούμε γράψε τον αριθμό τηλεφώνου σου" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Παρακαλούμε γράψε μερικές λεπτομέρειες" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Παρακαλούμε γράψε το email σου" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Παρακαλούμε γράψε τη διεύθυνση email σου" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Παρακαλούμε γράψε το όνομά σου" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Παρακαλούμε γράψε το όνομά σου" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Παρακαλούμε γράψε τον αριθμό τηλεφώνου σου" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Παρακαλούμε γράψε το επίθετό σου" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Παρακαλούμε γράψε τον τίτλο σου" @@ -2666,7 +2753,12 @@ msgstr "Παρακαλούμε σημείωσε ότι η ενημέρωσή σ msgid "Please note:" msgstr "Παρακαλούμε σημείωσε ότι:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Παρακαλούμε δώσε μερικές εξηγήσεις για τους λόγους που ξανανοίγεις αυτή την αναφορά" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2706,6 +2798,11 @@ msgstr "Παρακαλούμε δήλωσε αν το πρόβλημα έχει msgid "Please upload an image only" msgstr "Παρακαλούμε ανέβασε μία εικόνα μόνο" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Παρακαλούμε γράψε ένα μήνυμα" @@ -2715,7 +2812,7 @@ msgid "Please write your update here" msgstr "Παρακαλούμε γράψε την ενημέρωσή σου εδώ" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Δημοσίευση" @@ -2724,15 +2821,15 @@ msgstr "Δημοσίευση" msgid "Posted anonymously at %s" msgstr "Δημοσιεύθηκε ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Δημοσιεύθηκε από %s στις %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Δημοσιεύθηκε από %s (%s) στις %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Δημοσιεύθηκε από %s στις %s" @@ -2744,11 +2841,11 @@ msgstr "Βασισμένο στην κλειδί API για να σημαίνεται ότι οι αναφορές στέλνονται από την δική σου εγκατάσταση FixMyStreet." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Μερικές φωτογραφίες από πρόσφατες αναφορές" @@ -3508,15 +3618,20 @@ msgstr "Κείμενο για εντοπισμό" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Συγνώμη, φαίνεται πως αυτός ο ταχυδρομικός κώδικας είναι Crown dependency postcode, δεν καλύπτουμε τέτοιους ΤΚ," -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "Λυπούμαστε, αυτός δεν είναι ένας έγκυρος σύνδεσμος" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "Λυπούμαστε, αυτός δεν είναι ένας έγκυρος σύνδεσμος" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "Συγνώμη, υπήρξε βλάβη στην επιβεβαίωση του προβλήματός σου." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3549,20 +3664,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Ημερομηνία Έναρξης:" #: templates/web/base/admin/body.html:73 @@ -3572,15 +3688,18 @@ msgstr "Ημερομηνία Έναρξης:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Κατάσταση" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Αποθήκευση αλλαγών" @@ -3594,17 +3713,19 @@ msgstr "Αποθήκευση αλλαγών" msgid "State:" msgstr "Κατάσταση:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Κατάσταση" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Στατιστικά" @@ -3614,7 +3735,7 @@ msgstr "Στατιστικά" msgid "Status" msgstr "Κατάσταση" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Ακόμη ανοιχτό, μέσω ερωτηματολογίου, %s" @@ -3627,7 +3748,12 @@ msgstr "Street View" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Υποκατηγορία: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Υποκατηγορία: %s" @@ -3644,18 +3770,19 @@ msgstr "Θέμα" msgid "Subject:" msgstr "Θέμα:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Υποβολή" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3697,7 +3824,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3705,25 +3832,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Περίληψη" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Περιληπτικές αναφορές" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Περιληπτικές αναφορές" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Αποτελέσματα έρευνας" @@ -3731,14 +3864,14 @@ msgstr "Αποτελέσματα έρευνας" msgid "Template «%s»" msgstr "Πρότυπο «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Πρότυπα" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Κείμενο" @@ -3746,7 +3879,7 @@ msgstr "Κείμενο" msgid "Text only version" msgstr "Έκδοση απλού κειμένου" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3773,7 +3906,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Ευχαριστούμε για την πληροφόρηση" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Ευχαριστούμε που ανέβασες την φωτογραφία σου. Τώρα χρειάζεται να εντοπίσουμε το πρόβλημά σου, άρα παρακαλούμε γράψε μία κοντινή οδό ή ταχυδρομικό κώδικα στο πεδίο από πάνω :" @@ -3789,7 +3922,7 @@ msgstr "Η εικόνα δεν φαίνεται να έχει μεταφορτω msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Η τοποθεσία δεν φαίνεται να βρίσκεται στην αρμοδιότητα κάποιου συμβουλίου. Ίσως είναι εκτός ακτής ή εκτός της χώρας. Παρακαλούμε προσπάθησε ξανά." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Η τοποθεσία δεν φαίνεται να βρίσκεται στην Ελλάδα. Παρακαλούμε προσπάθησε ξανά." @@ -3799,11 +3932,11 @@ msgstr "Η τοποθεσία δεν φαίνεται να βρίσκεται σ msgid "That postcode was not recognised, sorry." msgstr "Ο ταχυδρομικός κώδικας δεν αναγνωρίστηκε, λυπούμαστε." -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Αυτό το πρόβλημα έχει σημειωθεί ως απεσταλμένο." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Το πρόβλημα τώρα θα αποσταλθεί ξανά." @@ -3837,8 +3970,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3875,8 +4008,8 @@ msgstr "Η υπηρεσία δεν θα μπορέσει να βοηθήσει msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "Ο πίνακας βραβείων επιμέλειας δείχνει τη δραστηριότητα των συντακτών (ποιος έχει συντάξει τις περισσότερες καταγραφές)." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Το σφάλμα ήταν: %s" @@ -3918,7 +4051,7 @@ msgstr "Τα πιο πρόσφατα προβλήματα που αναφέρθ msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Τα πιο πρόσφατα προβλήματα στα όρια του {{NAME}} που αναφέρθηκαν από χρήστες" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Ο σύνδεσμος ίσως έχει λήξει, ή μπορεί να μην τον επικολλήσατε σωστά." @@ -3943,7 +4076,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Ο χρήστης δεν μπορέσε να εντοπίσει το πρόβλημα στον χάρτη, αλλά για να δει την περιοχή κοντά στην τοποθεσία έγραψε" @@ -3956,33 +4089,38 @@ msgstr "" "Το όνομα του χρήστη προβάλλεται δημόσια σε αναφορές που δεν έχουν επισημανθεί ως ανώνυμες.\n" "Τα ονόματα δεν είναι απαραιτήτως μοναδικά." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Δεν υπάρχουν αναφορές προς εμφάνιση." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Υπήρξε πρόβλημα στην προβολή της σελίδας Όλες οι Αναφορές. Παρακαλούμε προσπάθησε ξανά αργότερα." #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "Υπήρξε πρόβλημα στην προβολή αυτής της σελίδας. Παρακαλούμε προσπάθησε αργότερα." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Υπήρξε πρόβλημα με το συνδυασμό του email/κωδικού πρόσβασής σου. Αν δεν μπορείς να θυμηθείς τον κωδικό σου, ή δεν έχεις, παρακαλούμε συμπλήρωσε τον τομέα ‘σύνδεση μέσω email’ αυτής της φόρμας." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Υπήρξε πρόβλημα με τον συνδυασμό email/κωδικού πρόσβασης. Παρακαλούμε προσπάθησε ξανά." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Υπήρξε πρόβλημα με το συνδυασμό του email/κωδικού πρόσβασής σου. Αν δεν μπορείς να θυμηθείς τον κωδικό σου, ή δεν έχεις, παρακαλούμε συμπλήρωσε τον τομέα ‘σύνδεση μέσω email’ αυτής της φόρμας." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Υπήρξε πρόβλημα με την ενημέρωσή σου. Παρακαλούμε προσπάθησε ξανά." @@ -3990,7 +4128,7 @@ msgstr "Υπήρξε πρόβλημα με την ενημέρωσή σου. Π msgid "There were problems with your report. Please see below." msgstr "Υπήρξαν προβλήματα με την αναφορά σου. Παρακαλούμε δες παρακάτω." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Υπήρξαν προβλήματα με την ενημέρωσή σου. Παρακαλούμε δες παρακάτω." @@ -4053,26 +4191,34 @@ msgstr "" "Αυτή η υπηρεσία θα δέχεται μόνο αναφορές για προβλήματα που βρίσκονται στην περιοχή αρμοδιότητας της.\n" "Μια υπηρεσία δεν θα δέχεται καμία αναφορά, εκτός αν είναι αρμόδια για τουλάχιστον μία περιοχή." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Αυτή η πληροφορία απαιτείται" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Αυτή είναι μια ιστοσελίδα για προγραμματιστές. Μερικές λειτουργίες ίσως χαλάσουν οποιαδήποτε στιγμή, και η βάση δεδομένων θα διαγράφεται περιοδικά." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4089,7 +4235,7 @@ msgstr "Αυτό το πρόβλημα δεν έχει διορθωθεί" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4099,23 +4245,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Αυτή η αναφορά αναμένει έγκριση." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Αυτή η αναφορά είναι προς το παρόν καταχωρημένη ως κλειστή." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Αυτή η αναφορά είναι προς το παρόν καταχωρημένη ως διορθωμένη." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Αυτή η αναφορά είναι προς το παρόν καταχωρημένη ως ανοιχτή." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Αυτή η αναφορά υποβλήθηκε ανώνυμα" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Αυτή η ιστοσελίδα περιέχει επίσης μία φωτογραφία του προβλήματος, που παρέχεται από το χρήστη." @@ -4126,7 +4272,7 @@ msgstr "Αυτή η ιστοσελίδα περιέχει επίσης μία φ msgid "Time spent (in minutes):" msgstr "Χρόνος που αφιερώθηκε (λεπτά):" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Χρονοδιάγραμμα" @@ -4138,20 +4284,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Τίτλος" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Τίτλος:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "Για να βρεις τις τοπικές ειδοποιήσεις που υπάρχουν για σένα, παρακαλούμε γράψε τον %s ταχυδρομικό σου κώδικα, την οδό ή την περιοχή σου." -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Για να βρεις τις τοπικές ειδοποιήσεις που υπάρχουν για σένα, παρακαλούμε γράψε τον ταχυδρομικό σου κώδικα, την οδό ή την περιοχή σου." @@ -4163,44 +4310,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "Για την προβολή ενός χάρτη με την ακριβή τοποθεσία του ζητήματος" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Σύνολο" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Σύνολο" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4213,18 +4352,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Δοκίμασε ξανά" @@ -4239,7 +4379,11 @@ msgstr "Στείλε μας ένα email:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4248,15 +4392,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Ανεπιβεβαίωτο" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "μη διορθωμένες αναφορές" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Άγνωστο" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Άγνωστο είδος ειδοποίησης" @@ -4266,13 +4406,14 @@ msgstr "Άγνωστο είδος ειδοποίησης" msgid "Unknown error" msgstr "Άγνωστο σφάλμα" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Άγνωστη ταυτότητα προβλήματος" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4297,12 +4438,12 @@ msgstr "Η παρακάτω ενημέρωση προστέθηκε ανώνυμ msgid "Update below added by %s at %s" msgstr "Η παρακάτω ενημέρωση προστέθηκε από %s στις %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Ενημέρωση σώματος" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Ανάλυση ενημέρωσης ανά κατάσταση" @@ -4310,16 +4451,16 @@ msgstr "Ανάλυση ενημέρωσης ανά κατάσταση" msgid "Update by {{name}}" msgstr "Ενημέρωση από {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Η ενημέρωση άλλαξε την κατάσταση του προβλήματος σε %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Η ενημέρωση επισήμανε το πρόβλημα ως διορθωμένο" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Η ενημέρωση άνοιξε ξανά το πρόβλημα" @@ -4333,20 +4474,20 @@ msgstr "Καταστάσεις ενημέρωσης" msgid "Updated" msgstr "Ενημερώθηκε" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Δημοσιεύθηκε από %s (%s) στις %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Δημοσιεύθηκε από %s στις %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4354,7 +4495,7 @@ msgid "Updated!" msgstr "Ενημερώθηκε!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Ενημερώσεις" @@ -4401,40 +4542,81 @@ msgstr "Χάρτης σε χρήση" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Το Email προστέθηκε στην μαύρη λίστα" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Το Email είναι ήδη στην μαύρη λίστα" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Η επισήμανση του χρήστη αφαιρέθηκε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Ο χρήστης επισημάνθηκε" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "Βρίσκεται στον πίνακα καταχρήσεων;" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Η αναζήτηση χρηστών βρίσκει αποτελέσματα για ονόματα χρηστών και διευθύνσεις email." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Χρήστες" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Χρήστες" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Οι τιμές ενημερώθηκαν" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Η διεύθυνση του e-mail σου" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Ο αριθμός τηλεφώνου σου" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4456,12 +4638,7 @@ msgstr "Προβάλλεται μία τοποθεσία" msgid "Viewing a problem" msgstr "Προβάλλεται ένα πρόβλημα" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4471,20 +4648,25 @@ msgstr "Πτέρυγες του συμβουλίου" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Βρήκαμε παραπάνω από ένα αποτέλεσμα για αυτήν την τοποθεσία. Εδώ παρουσιάζουμε 10 αποτελέσματα, παρακαλούμε δοκίμασε άλλη αναζήτηση αν δε βρήκες αυτό που έψαχνες." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Συγνώμη, δεν μπορέσαμε να βρούμε αυτήν την τοποθεσία." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "Χρειαζόμαστε το email σου, παρακαλώ γράψ" το παρακάτω." -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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. Ωστόσο, μέχρι στιγμής δεν έχουμε πληροφορίες επικοινωνίας μαζί τους. Αν γνωρίζεις μία κατάλληλη διεύθυνση επικοινωνίας, παρακαλούμε επικοινώνησε μαζί τους." @@ -4492,6 +4674,12 @@ msgstr "Καταλαβαίνουμε ότι το πρόβλημα ίσως εί msgid "We send it to the council on your behalf" msgstr "Και εμείς θα το στείλουμε στην υπηρεσία εκ μέρους σου" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Βρήκαμε παραπάνω από ένα αποτέλεσμα για αυτήν την τοποθεσία. Εδώ παρουσιάζουμε 10 αποτελέσματα, παρακαλούμε δοκίμασε άλλη αναζήτηση αν δε βρήκες αυτό που έψαχνες." + #: 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." @@ -4501,8 +4689,8 @@ msgstr "Θα χρησιμοποιήσουμε τις προσωπικές σου msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "Λυπούμαστε που το πρόβλημα δε λύθηκε. Γιατί δε δοκιμάζετε να επικοινωνήσετε απευθείας με τις τοπικές αρχές;" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4530,7 +4718,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4553,6 +4741,10 @@ msgstr "Επιθυμία" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "Με τις αναζητήσεις αιτημάτων, είναι επίσης δυνατό να αναζητήσεις με το πεδίο agency_responsible περιορίζοντας τα αποτελέσματα στις αιτήσεις που στέλνονται σε έναν συγκεκριμένο τομέα. Ο όρος αναζήτησης είναι ο Κωδικός (ID) ενός τομέα που παρέχεται από το MapIt." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "Θα ήθελες να συνεισφέρεις στο FixMyStreet; Ο κώδικας μας είναι ανοιχτής πηγής και διαθέσιμος στο fixmystreet.org." @@ -4569,16 +4761,7 @@ msgstr "Να χρησιμοποιείς τα κατάλληλα σημεία σ msgid "Wrong location? Just click again on the map." msgstr "Λάθος γεωγραφική τοποθεσία; Απλά κάνε κλικ ξανά πάνω στον χάρτη." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Έτος" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4593,7 +4776,7 @@ msgstr "Έτος" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Ναι" @@ -4606,7 +4789,7 @@ msgstr "Ναι έχω κωδικό πρόσβασης" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Παραπονιέσαι ότι, αυτή η αναφορά προβλήματος διαγράφτηκε από τον διαχειριστή χωρίς λόγο: " -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4623,7 +4806,7 @@ msgstr "Με το παρόν, δηλώνεις ότι η παρακάτω ενη msgid "You can view the problem on this site." msgstr "Μπορείς να δεις το πρόβλημα σε αυτόν τον ιστότοπο." -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Μπορείς να προσθέσεις την ηλεκτρονική διεύθυνση ενός καταχρηστικού χρήστη στην λίστα καταχρήσεων, κάτι που αυτόματα θα αποκρύπτει (και δεν θα αποστέλλει) αναφορές που αυτός δημιουργεί." @@ -4652,7 +4835,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Μπορείς να επισημάνεις έναν τομέα ως διαγεγραμμένο αν δεν θέλεις να είναι ενεργός σε αυτόν τον ιστότοπο." @@ -4660,7 +4843,7 @@ msgstr "Μπορείς να επισημάνεις έναν τομέα ως δι msgid "You declined; please fill in the box above" msgstr "Έχεις υποχωρήσει - παρακαλούμε συμπλήρωσε το κουτί που υπάρχει παραπάνω." -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4687,18 +4870,38 @@ msgstr "Έχεις αποσυνδεθεί" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Έχεις σημειώσει την τοποθεσία του προβλήματος με το πράσινο σημάδι πάνω στον χάρτη. Αν αυτή δεν είναι η σωστή τοποθεσία, απλά κάνε κλικ ξανά πάνω στον χάρτη." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Επιβεβαίωσες την διεύθυνση email σου επιτυχώς." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Επιβεβαίωσες την διεύθυνση email σου επιτυχώς." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Επιβεβαίωσες την διεύθυνση email σου επιτυχώς." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Επιβεβαίωσες την διεύθυνση email σου επιτυχώς." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Έχεις με επιτυχία εγγραφεί, παρακαλούμε έλεγξε και επιβεβαίωσε αν οι λεπτομέρειες είναι σωστές:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Επιβεβαίωσες την διεύθυνση email σου επιτυχώς." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Δεν έχεις υποβάλλει ακόμα κάποιες αναφορές. Ανάφερε κάποιο πρόβλημα τώρα." @@ -4725,36 +4928,43 @@ msgid "Your Reports" msgstr "Οι Αναφορές σου" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Το e-mail σου" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Η διεύθυνση του e-mail σου" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Η διεύθυνση του e-mail σου" + #: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our privacy policy" msgstr "Οι πληροφορίες σου θα χρησιμοποιηθούν μόνο σύμφωνα με την πολιτική απορρήτου" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4765,19 +4975,19 @@ msgstr "Το όνομά σου" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4788,8 +4998,8 @@ msgstr "Ο κωδικός σου" msgid "Your password has been changed" msgstr "Ο κωδικός σου έχει αλλάξει" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Ο αριθμός τηλεφώνου σου" @@ -4798,7 +5008,7 @@ msgstr "Ο αριθμός τηλεφώνου σου" msgid "Your report" msgstr "Η αναφορά σου" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Οι αναφορές σου" @@ -4807,25 +5017,40 @@ msgstr "Οι αναφορές σου" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Ο κωδικός σου έχει αλλάξει" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Οι ενημερώσεις σου" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4842,8 +5067,8 @@ msgstr "υπηρεσία" msgid "didn't use map" msgstr "δεν χρησιμοποιήθηκε χάρτης" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "π.χ. ‘%s’ ή ‘%s’" @@ -4866,23 +5091,24 @@ msgstr "τελευταία ενημέρωση %s" msgid "less than a minute" msgstr "λιγότερο από ένα λεπτό" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "μη διαθέσιμο" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "σημειωμένο ως εκτός αρμοδιότητας της υπηρεσίας" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "ή να βρεθεί η τοποθεσία μου αυτόματα" @@ -4923,7 +5149,7 @@ msgstr "δεν υπάρχει καρφίτσα στον χάρτη επειδή msgid "this location" msgstr "Προβάλλεται μία τοποθεσία" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "αυτή η κατηγορία τοπικού προβλήματος" @@ -4931,11 +5157,11 @@ msgstr "αυτή η κατηγορία τοπικού προβλήματος" msgid "today" msgstr "σήμερα" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4943,14 +5169,24 @@ msgstr "" msgid "used map" msgstr "χάρτης σε χρήση" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "ο χρήστης είναι από την ίδια υπηρεσία όπως και το πρόβλημα - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "ο χρήστης είναι ο ιδιοκτήτης του προβλήματος" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Το Email είναι ήδη στην μαύρη λίστα" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Το Email προστέθηκε στην μαύρη λίστα" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5012,35 +5248,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5110,6 +5346,45 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(το email βρίσκεται στη μαύρη λίστα)" + +#~ msgid "By Date" +#~ msgstr "Ανά ημερομηνία" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Κάνε κλικ εδώ ή κάνε εισαγωγή με τη μορφή ηη/μμ/εεεε" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Επιβεβαιωμένες αναφορές μεταξύ %s και %s" + +#~ msgid "Hide old" +#~ msgstr "Απόκρυψη παλιών" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Να περιλαμβάνονται μη επιβεβαιωμένες αναφορές" + +#~ msgid "Invalid end date" +#~ msgstr "Λανθασμένη ημερομηνία λήξης" + +#~ msgid "Invalid start date" +#~ msgstr "Λανθασμένη ημερομηνία έναρξης" + +#~ msgid "No council" +#~ msgstr "Καμιά υπηρεσία" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Όταν συμπεριλαμβάνουμε ανεπιβεβαίωτες αναφορές, χρησιμοποιούμε την ημερομηνία που δημιουργήθηκε η αναφορά, η οποία ενδέχεται να μην έγινε στον ίδιο μήνα που επιβεβαιώθηκε η αναφορά. Επομένως, οι αριθμοί ίσως είναι λίγο εκτός." + +#~ msgid "Show old" +#~ msgstr "Προβολή παλαιότερων" + +#~ msgid "Unfixed reports" +#~ msgstr "μη διορθωμένες αναφορές" + +#~ msgid "Year" +#~ msgstr "Έτος" + #~ msgid "" #~ "%s sends different categories of problem\n" #~ "to the appropriate council, so problems within the boundary of a particular council\n" @@ -5167,9 +5442,6 @@ msgstr[1] "" #~ msgid "No further action" #~ msgstr "Δεν είναι εφικτή η διόρθωση" -#~ msgid "Not Responsible" -#~ msgstr "Δεν είναι Υπεύθυνος" - #~ msgid "Or problems reported to:" #~ msgstr "Ή προβλήματα που αναφέρθηκαν σε:" diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po index 9c853f28891..41345b71606 100644 --- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: mySociety , 2017\n" +"Last-Translator: Francisco Jimenez Asensio , 2017\n" "Language-Team: Spanish (https://www.transifex.com/mysociety/teams/12067/es/)\n" "Language: es\n" "MIME-Version: 1.0\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr " y " @@ -32,6 +32,10 @@ msgstr " y " msgid " or " msgstr " o " +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d ediciones por %s" @@ -48,11 +52,11 @@ msgstr "%s - Informes de notificación" #. ("%s here is the site name") #: templates/web/base/admin/navigation.html:3 msgid "%s admin:" -msgstr "" +msgstr "admin:" #: templates/web/base/status/stats.html:26 msgid "%s bodies" -msgstr "" +msgstr "%s organismos" #: templates/web/base/status/stats.html:24 msgid "%s confirmed alerts, %s unconfirmed" @@ -64,25 +68,30 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s contactos en Ayuntamiento – %s confirmados, %s sin confirmar" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" "problems within a certain distance of a particular location." -msgstr "" +msgstr "%s tiene una variedad de feeds RSS y alertas de correo electrónico para los problemas locales, incluyendo alertas para todos los problemas dentro de una palabra en particular, o todos los problemas dentro de una cierta distancia de una ubicación en particular." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" "within a certain distance of a particular location." -msgstr "" +msgstr "%s tiene una variedad de feeds RSS y alertas por correo electrónico para problemas locales, incluyendo alertas para todos los problemas dentro de un distrito o concejo en particular, o todos los problemas dentro de cierta distancia de un lugar en particular." #: templates/web/base/status/stats.html:23 msgid "%s live updates" msgstr "%s actualizaciones en vivo" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s cuestionarios enviados – %s respondidos (%s%%)" @@ -91,18 +100,13 @@ msgstr "%s cuestionarios enviados – %s respondidos (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© colaboradores OpenStreetMap" #: templates/web/zurich/report/new/fill_in_details_form.html:21 msgid "(Defect & location of defect)" -msgstr "" - -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(email registrado en la tabla de abusos)" +msgstr "(Defect & localización por defecto)" #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 @@ -116,16 +120,15 @@ msgstr "(Sin número de teléfono)" #: templates/web/base/admin/states/index.html:95 msgid "(a-z and space only)" -msgstr "" +msgstr "(a-z y espacio en blanco)" #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(cerrado)" #: templates/web/base/alert/_list.html:30 -#, fuzzy msgid "(covers roughly 200,000 people)" -msgstr "(distancia que cubre aproximadamente 200.000 personas)" +msgstr "(cubre aproximadamente 200.000 personas)" #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" @@ -133,15 +136,15 @@ msgstr "(arreglado)" #: templates/web/base/admin/extra-metadata-form.html:53 msgid "(ignored if type is \"String\")" -msgstr "" +msgstr "(ignorado si el tipo es \"String\")" #: templates/web/base/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" -msgstr "" +msgstr "(ya no existe)" #: templates/web/base/report/_item.html:70 msgid "(not sent to council)" @@ -157,12 +160,11 @@ msgstr "(enviado a ambos)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:36 -#, fuzzy msgid "(we also have RSS feeds for problems within %s)" -msgstr "Listado RSS de los problemas dentro de %s" +msgstr "(también tenemos feeds RSS para problemas en %s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Escoja una categoría --" @@ -173,15 +175,7 @@ msgstr "--Elegir una plantilla--" #: templates/web/base/report/new/form_report.html:23 msgid "10 inch pothole on Example St, near post box" -msgstr "" - -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" +msgstr "Bache de 50cm o 10 pulgadas en la C/Ejemplo, junto al edificio de correos" #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 @@ -194,51 +188,70 @@ msgstr "" "Probablemente por eso el \"area cubierta\" está vacía (abajo).
\n" "Por favor añada MAPIT_TYPES en su archivo de configuración." -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 msgid "

Reports, Statistics and Actions for

%s

" -msgstr "" +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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" -msgstr "" +msgstr " %s informes %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." -msgstr "" +msgstr "%s guardado" #: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "%s live problems" msgstr "%s notificaciones en curso" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "No- confirmar mi notificación por email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "No- confirmar mi notificación por email" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "No- confirmar mi actualización por email" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "No- confirmar mi actualización por email" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "No- permítanme registrarme por email" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "No- permítanme registrarme por email" + +#: templates/web/base/report/_inspect.html:177 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." -msgstr "" +msgstr "Nota\\: Este informe se ha enviado para la acción. Los cambios realizados no se transmitirán." -#: templates/web/base/report/_inspect.html:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." -msgstr "" +msgstr "Nota\\: Este informe aún no ha sido enviado para la acción. Cualquier cambio hecho no puede ser enviado." -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Sí- tengo una contraseña" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -255,22 +268,28 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Agregue un órgano" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Suspender este email" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" -msgstr "" +msgstr "Añadir campos extra" #: templates/web/base/admin/extra-metadata-form.html:79 msgid "Add field" -msgstr "" +msgstr "Añadir campo" #: templates/web/base/admin/states/index.html:85 msgid "Add fixed state" -msgstr "" +msgstr "Añadir estado de reparación" #: templates/web/base/admin/body.html:126 #: templates/web/zurich/admin/body.html:31 @@ -278,17 +297,22 @@ msgid "Add new category" msgstr "Agregar nueva categoría" #: templates/web/base/admin/extra-metadata-form.html:72 -#, fuzzy msgid "Add option" -msgstr "(opcional)" +msgstr "Añadir opción" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Sin 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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" -msgstr "" +msgstr "Añadir a favoritos" #: templates/web/base/admin/user_edit.html:4 #: templates/web/base/admin/users.html:48 @@ -296,29 +320,29 @@ msgstr "" msgid "Add user" msgstr "Añadir un usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" -msgstr "" +msgstr "Añadir/editar categoría de problemas" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" -msgstr "" +msgstr "Añadir / editar prioridades de respuesta" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" -msgstr "" +msgstr "Añadir / editar plantillas de respuesta" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Añadido %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." -msgstr "" +msgstr "Añadir este informe a tu lista de favoritos lo eliminará de la lista de favoritos de %s." #: templates/web/base/main_nav_items.html:47 msgid "Admin" -msgstr "" +msgstr "Administrador" #: templates/web/base/auth/change_password.html:39 msgid "Again:" @@ -336,55 +360,56 @@ msgstr "Alerta %d desactivada (creada %s)" msgid "Alert me to future updates" msgstr "Notificadme actualizaciones futuras" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" -msgstr "" +msgstr "Todos" #: templates/web/zurich/reports/index.html:13 msgid "All Reports" msgstr "Todas las notificaciones" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Todas las notificaciones como CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Todas las categorías" #: templates/web/base/admin/reportextrafields/edit.html:26 -#, fuzzy msgid "All cobrands" -msgstr "Cobrand" +msgstr "" #: templates/web/base/admin/reportextrafields/edit.html:47 msgid "All languages" -msgstr "" +msgstr "Todos los lenguajes" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Todas las notificaciones" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Todas las notificaciones entre %s y %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" -msgstr "" +msgstr "Todo el tiempo" #: 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 "" +msgstr "Alternativamente, podemos ocultar tu nombre en todos tus informes y actualizaciones en el sitio\\:" #: templates/web/base/questionnaire/index.html:47 msgid "An update marked this problem as fixed." @@ -397,9 +422,8 @@ msgstr "Anónimo" #: templates/web/base/report/new/form_user_loggedin.html:21 #: templates/web/base/report/update/form_name.html:17 -#, fuzzy msgid "Anonymous user" -msgstr "Anónimo" +msgstr "Usuario anónimo" #: templates/web/base/admin/report_edit.html:122 #: templates/web/base/admin/update_edit.html:23 @@ -416,7 +440,8 @@ 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:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "¿Estás seguro?" @@ -427,7 +452,7 @@ msgstr "¿Estás seguro?" msgid "Area covered" msgstr "Área cubierta" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "Área:" @@ -438,10 +463,10 @@ msgstr "Puesto que éste es un servidor de integración y %s es falsa, las notif #: templates/web/zurich/admin/report_edit.html:209 msgid "Assign to competent body:" -msgstr "" +msgstr "Asignar al organismo competente\\:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Asigne a otra categoria:" @@ -453,9 +478,9 @@ msgstr "Asignar a un órgano externo:" msgid "Assign to subdivision:" msgstr "Asigne a la subdivisión:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" -msgstr "" +msgstr "Asignar usuarios a áreas" #: perllib/FixMyStreet/Cobrand/Zurich.pm:219 msgid "Assigned to %s" @@ -469,34 +494,31 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." -msgstr "" +msgstr "Los usuarios del personal autorizado pueden asociarse con las categorías en las que operan." -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Auto-respuesta \\:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" -msgstr "" +msgstr "Auto-respuesta \\:" #: templates/web/base/admin/report-category.html:8 msgid "Available categories" -msgstr "" +msgstr "Categorías disponibles" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." -msgstr "" - -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" +msgstr "Promedio de tiempo entre el informe de un problema y su arreglo, últimos 100 informes" #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" -msgstr "" +msgstr "Evite la información personal y las matrículas de vehículos" #: perllib/FixMyStreet/DB/Result/Problem.pm:344 #: templates/web/zurich/report/_item.html:9 @@ -507,20 +529,21 @@ msgstr "En espera de revisión" msgid "Back" msgstr "Atras" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" -msgstr "" +msgstr "Volver a todos los informes" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Suspender este email" +#, fuzzy +msgid "Ban user" +msgstr "Marca usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Órganos administrativos" @@ -531,28 +554,25 @@ msgstr "Órganos administrativos" msgid "Body" msgstr "Órgano administrativo" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Órgano administrativo:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Por Fecha" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" -msgstr "" +msgstr "Puede utilizarse para mostrar texto adicional al usuario junto al campo. La plantilla predeterminada no muestra esto ( meta.datatype_description ), debe agregarla en category_extras_fields.html " #: templates/web/base/auth/token.html:27 templates/web/base/email_sent.html:20 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." -msgstr "" +msgstr "¿No puede encontrar nuestro correo electrónico? Revise su carpeta de spam   – es la solución en el 99% de lis casos." #: templates/web/base/around/_report_banner.html:5 msgid "Can't see the map? Skip this step" msgstr "¿No puedes ver el mapa? Salte este paso" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Categorías" @@ -563,30 +583,36 @@ msgstr "Categorías:" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Categoría" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Categoría" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categoría cambiada de '%s' a '%s'" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "Ratio de arreglo de problemas > 4 semanas" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -594,17 +620,18 @@ msgstr "Ratio de arreglo de problemas > 4 semanas" msgid "Category:" msgstr "Categoría:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Categoría: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "Cambiar email" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "Cambiar dirección de email" @@ -612,13 +639,19 @@ msgstr "Cambiar dirección de email" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Cambiar contraseña" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Sin número de teléfono)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." -msgstr "" +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 msgid "" @@ -646,18 +679,13 @@ 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" -msgstr "" +msgstr "Elija otro" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" -msgstr "" - -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Haga click aqui o introduzca dd/mm/yyyy" +msgstr "Borrar datos sin conexión" #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" @@ -665,39 +693,40 @@ msgstr "Haga clic en el mapa para notificar un problema" #: templates/web/base/email_sent.html:13 msgid "Click the link in our confirmation email to activate your alert." -msgstr "" +msgstr "Haga clic en el enlace de nuestro correo electrónico de confirmación para activar su alerta." #: templates/web/base/email_sent.html:9 msgid "Click the link in our confirmation email to publish your problem." -msgstr "" +msgstr "Haga clic en el enlace en nuestro correo electrónico de confirmación para publicar su problema" #: templates/web/base/email_sent.html:11 msgid "Click the link in our confirmation email to publish your update." -msgstr "" +msgstr "Haga clic en el enlace de nuestro correo electrónico de confirmación para publicar su actualización." #: templates/web/base/auth/token.html:23 msgid "Click the link in our confirmation email to sign in." -msgstr "" +msgstr "Haga clic en el enlace de nuestro correo electrónico de confirmación para iniciar sesión." #: templates/web/base/auth/token.html:20 msgid "Click the link in that email to sign in." -msgstr "" +msgstr "Haz clic en el enlace de ese correo electrónico para iniciar sesión." #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Cerrada" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Cerrada por el Ayuntamiento" @@ -712,24 +741,25 @@ msgid "Cobrand" msgstr "Cobrand" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Datos cobrand:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" -msgstr "" +msgstr "Código" #: templates/web/base/js/translation_strings.html:50 msgid "Collapse map" -msgstr "" +msgstr "Cerrar mapa" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuración" @@ -738,7 +768,7 @@ msgstr "Configuración" msgid "Confirm" msgstr "Confirmar" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Confirmar cuenta" @@ -757,14 +787,10 @@ msgstr "Confirmación" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Confirmado" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Notificaciones confirmadas entre %s y %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -791,8 +817,8 @@ msgstr "Contactar con el equipo" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "No se pudo encontrar el usuario" @@ -810,50 +836,22 @@ msgstr "Ayuntamiento" msgid "Council contacts for %s" msgstr "Contactos del ayuntamiento para %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "Referencia del ayuntamiento: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Ayuntamiento:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Total" #: templates/web/base/admin/states/index.html:114 -#, fuzzy msgid "Create" -msgstr "Creado" +msgstr "" #: templates/web/base/email_sent.html:1 msgid "Create a report" @@ -868,39 +866,44 @@ msgstr "Crear una categoría" msgid "Create priority" msgstr "Crear una prioridad" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Crear plantilla" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Creado" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Creado:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Estado actual" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -911,14 +914,14 @@ msgstr "No se han creado organismos aún." msgid "Customer not contactable" msgstr "Cliente no localizable" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Cuadro de mando" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Tratado por el departamento dentro de los 5 días hábiles" @@ -927,16 +930,15 @@ msgid "Default" msgstr "" #: templates/web/base/admin/responsepriorities/edit.html:39 -#, fuzzy msgid "Default priority" -msgstr "Crear una prioridad" +msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Eliminar plantilla" @@ -947,8 +949,8 @@ msgstr "Eliminar plantilla" msgid "Deleted" msgstr "Eliminado" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -964,6 +966,10 @@ msgstr "Descripción" msgid "Description:" msgstr "Descripción:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -976,6 +982,10 @@ msgstr "Detalles" msgid "Details:" msgstr "Detalles:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Transferido" @@ -989,8 +999,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "Ranking de premios a la constancia" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -999,7 +1009,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1007,7 +1017,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1027,11 +1037,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1054,9 +1064,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Editar" @@ -1066,33 +1077,33 @@ msgstr "Editar" msgid "Edit body details" msgstr "Editar los detalles del órgano administrativo" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Editando el problema %d" @@ -1113,7 +1124,6 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1121,17 +1131,20 @@ msgstr "Editor" msgid "Email" msgstr "Email:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Email añadido a lista de abusones" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "Dirección de email" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Dirección de email" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Creada alerta de email" @@ -1140,19 +1153,18 @@ msgstr "Creada alerta de email" msgid "Email alert deleted" msgstr "Borrada alerta de email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Email ya incluido en la lista de abusones" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Email: %s" @@ -1169,8 +1181,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/body-form.html:123 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" @@ -1180,8 +1192,9 @@ 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Fecha final:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1202,14 +1215,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Introduzca el nombre de una calle cercana" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Introduzca una contraseña" @@ -1227,8 +1240,8 @@ msgstr "Introduzca detalles del problema" msgid "Error" msgstr "Error" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Todo" @@ -1253,7 +1266,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1269,7 +1282,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "URL Externo" @@ -1281,19 +1294,18 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 -#, fuzzy msgid "Extra Fields" -msgstr "Datos adicionales:" +msgstr "" #: templates/web/base/admin/contact-form.html:141 #: templates/web/base/admin/report_edit.html:94 msgid "Extra data:" msgstr "Datos adicionales:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1323,21 +1335,22 @@ msgstr "Arreglar esto eligiendo un área cubierta en el formul #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Arreglado" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Arreglado - Ayuntamiento" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Arreglado - Usuario" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Marcar como borrado" @@ -1345,7 +1358,7 @@ msgstr "Marcar como borrado" msgid "Flag user" msgstr "Marca usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Marcado" @@ -1354,7 +1367,7 @@ msgstr "Marcado" msgid "Flagged reports and users" msgstr "Señalizar informes y usuarios" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Los usuarios marcados se listan en página demarcados" @@ -1362,8 +1375,8 @@ msgstr "Los usuarios marcados se listan en página demarcados" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Marcado:" @@ -1383,7 +1396,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Para más información, vea Cómo FixMyStreet usa Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1403,8 +1416,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Listado de Preguntas Frecuentes" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1437,12 +1454,12 @@ msgstr "¡Nos alegra saber que ha sido arreglado!" #: 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Ir" @@ -1450,7 +1467,7 @@ msgstr "Ir" msgid "Going to send questionnaire?" msgstr "¿Va a enviar cuestionario?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1458,6 +1475,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Gráfico temporal de creación problemas por estado" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "por %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "¿Ha sido corregido este problema?" @@ -1478,21 +1504,26 @@ msgstr "Ayuda" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Fotos de notificaciones cercanas recientes" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "%s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Oculto" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1513,21 +1544,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Ocultar antiguos" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Ocultar marcadores" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1539,7 +1567,7 @@ msgstr "" msgid "History" msgstr "Historial" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Inicio" @@ -1598,6 +1626,10 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1606,6 +1638,10 @@ 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 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." @@ -1614,7 +1650,7 @@ msgstr "Si usted consigue algo más de información sobre el estado del problema 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1623,7 +1659,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1703,11 +1739,7 @@ msgstr "Bandeja de entrada vacía" msgid "Include reporter personal details" msgstr "Incluir datos del notificador" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Incluir notificaciones no confirmadas" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Valor incorrecto para has_photo \"%s\"" @@ -1719,7 +1751,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1731,26 +1763,18 @@ msgstr "Notas internas" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Valor inválido para agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Fecha de fin inválida" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Especificado un formato no válido %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Fecha de inicio no válida" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "A menudo es más rápido consultar nuestro Listado de Preguntas Frecuentes y ver si la respuesta está allí." @@ -1769,7 +1793,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1794,12 +1818,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1825,18 +1844,14 @@ msgstr "Última actualización:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1845,13 +1860,13 @@ msgstr "" msgid "List all reported problems" msgstr "Listar todos los problemas notificados" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Cargando..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1883,12 +1898,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1896,11 +1914,11 @@ msgstr "" msgid "MAP" msgstr "MAPA" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1912,11 +1930,11 @@ msgstr " Mapa" msgid "Mark as sent" msgstr "Marcado como enviado" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 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:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1936,45 +1954,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Falta jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Moderado por el organismo durante el siguiente día laborable" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Mes" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1992,9 +2010,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2005,19 +2023,23 @@ msgstr "Nombre" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Nombre:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Nombre: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2027,12 +2049,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2048,19 +2070,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Nuevo organismo añadido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Añadida nueva categoría de contactos" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2081,6 +2107,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Sin número de teléfono)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2110,18 +2141,19 @@ msgstr "Nuevos problemas en los límites de {{NAME}} en FixMyStreet" msgid "New reports" msgstr "Nuevos informes" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Nuevo estado" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2129,7 +2161,7 @@ msgstr "" msgid "Next" msgstr "Siguiente" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2141,22 +2173,18 @@ msgstr "Siguiente" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "No" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Sin órgano administrativo" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Sin ayuntamiento" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Ningún ayuntamiento seleccionado" @@ -2186,6 +2214,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Ningún resultado devuelto" @@ -2210,15 +2242,15 @@ msgstr "No hay seguidores" msgid "None" msgstr "Nada" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2241,7 +2273,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "No para mi subdivisión" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "No notificado anteriormente" @@ -2255,10 +2287,6 @@ msgstr "No comunicado al ayuntamiento" msgid "Note" msgstr "Nota" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Tenga en cuenta que al incluir notificaciones no confirmadas usamos la fecha de creación de la notificación, que puede no coincidir con el mes en se confirmó, así que los números pueden variar un poco." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2286,37 +2314,46 @@ msgstr "Ahora a enviar tu notificación…" msgid "Now to submit your update…" msgstr "Ahora a enviar tu notificación…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Estado antiguo" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2355,23 +2392,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Otros" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "otras áreas:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2389,19 +2433,19 @@ msgstr "Página no encontrada" msgid "Parent" msgstr "Padre" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Contraseña (opcional)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Contraseña:" @@ -2409,7 +2453,7 @@ msgstr "Contraseña:" msgid "Permalink" msgstr "Enlace permanente" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2417,19 +2461,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Número de teléfono" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Número de teléfono (opcional)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Teléfono:" @@ -2445,7 +2494,7 @@ msgstr "Teléfono:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2471,12 +2520,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Fotos de notificaciones cercanas recientes" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Coloque el marcador en el mapa" @@ -2498,25 +2552,34 @@ msgstr "Por favor, sea cortés, conciso y vaya al grano." msgid "Please check the passwords and try again" msgstr "Por favor, comprueba la contraseña e inténtalo de nuevo" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Por favor, compruebe que su dirección de email es correcta" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Por favor, elija una categoría" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Por favor, corrija los errores a continuación" @@ -2531,39 +2594,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Por favor escriba su mensaje." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Por favor, introduzca su número de telefono" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Por favor, introduzca una contraseña" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Por favor, introduzca un título" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Por favor, introduce una dirección de email válida" @@ -2572,55 +2643,62 @@ msgstr "Por favor, introduce una dirección de email válida" msgid "Please enter a valid email address" msgstr "Por favor, introduce una dirección de email válida" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Por favor, introduzca su número de telefono" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Por favor, describa los detalles más relevantes" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Por favor, introduzca su dirección de email" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Por favor introduzca su email" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Por favor, indique su nombre" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Por favor, introduzca su nombre" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Por favor, introduzca su número de telefono" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Introduzca su segundo nombre" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Por favor, introduzca su título" @@ -2669,7 +2747,12 @@ msgstr "" msgid "Please note:" msgstr "Por favor, tenga en cuenta:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Por favor, explique por qué está reabriendo esta notificación." + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2709,6 +2792,11 @@ msgstr "Por favor, indique si el problema se ha solucionado" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Por favor, escriba un mensaje" @@ -2718,7 +2806,7 @@ msgid "Please write your update here" msgstr "Por favor, escriba su actualización aquí" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Publicar" @@ -2727,15 +2815,15 @@ msgstr "Publicar" msgid "Posted anonymously at %s" msgstr "Publicado de forma anónima - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Publicado por %s - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Publicado por %s (%s) - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Publicado por %s - %s" @@ -2747,11 +2835,11 @@ msgstr "" msgid "Previous" msgstr "Previo" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2768,7 +2856,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privado" @@ -2792,29 +2880,28 @@ msgstr "Problema %s confirmado" msgid "Problem %s sent to council %s" msgstr "Problema %s enviado al Ayuntamiento %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Desglose de problemas según estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problema marcado como abierto." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "El estado del problema cambió debido a los resultados de la encuesta" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemas" #: templates/web/base/alert/_list.html:22 -#, fuzzy msgid "Problems in an area" -msgstr "Problemas en el barrio %s" +msgstr "" #: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" @@ -2829,11 +2916,10 @@ msgid "Problems recently reported fixed on FixMyStreet" msgstr "Problemas recientemente notificados como arreglados en FixMyStreet" #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "Problems within %.1fkm of %s" -msgstr "Problemas en %.1fkm alrededor" +msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2845,9 +2931,8 @@ msgid "Problems within %s ward" msgstr "Problemas en el barrio %s" #: perllib/FixMyStreet/Cobrand/UK.pm:263 perllib/FixMyStreet/Cobrand/UK.pm:275 -#, fuzzy msgid "Problems within %s ward, %s" -msgstr "Problemas en el barrio %s" +msgstr "" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 @@ -2859,7 +2944,8 @@ msgstr "" msgid "Property address:" msgstr "Dirección de la propiedad:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Proporcionar una actualización" @@ -2868,12 +2954,12 @@ msgstr "Proporcionar una actualización" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Proporcionar un nombre y una contraseña es opcional, pero hacerlo le permitirá notificar y actualizar los problemas más fácilmente, así como administrar sus informes." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Proporcionar una contraseña es opcional, pero hacerlo le permitirá notificar y actualizar los problemas más fácilmente, así como administrar sus informes." @@ -2886,12 +2972,12 @@ msgstr "" msgid "Public response:" msgstr "Respuesta del público:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Publicar foto" @@ -2946,7 +3032,7 @@ msgstr "Listado RSS para %s, en el barrio %s" msgid "RSS feed of nearby problems" msgstr "Listado RSS de los problemas cercanos" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2971,7 +3057,7 @@ msgstr "Listado RSS de actualizaciones sobre este problema" msgid "Receive email when updates are left on this problem." msgstr "Reciba un correo cuando se dejen actualizaciones sobre este problema." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2985,7 +3071,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Problemas recientemente notificados" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2994,14 +3080,12 @@ msgid "Remember that FixMyStreet is primarily for reporting physical problems th msgstr "Recuerde que FixMyStreet es principalmente para informar sobre problemas físicos que pueden ser arreglados. Si su problema no es apropiado para ser presentado a través de este sitio recuerde que puede ponerse en contacto con su Ayuntamiento directamente mediante su página web." #: templates/web/base/admin/extra-metadata-form.html:68 -#, fuzzy msgid "Remove" -msgstr "Eliminar marca" +msgstr "" #: templates/web/base/admin/extra-metadata-form.html:4 -#, fuzzy msgid "Remove field" -msgstr "Eliminar marca" +msgstr "" #: templates/web/base/admin/report_blocks.html:23 msgid "Remove flag" @@ -3009,9 +3093,9 @@ msgstr "Eliminar marca" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -3019,12 +3103,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Quitar foto (¡no se puede deshacer!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3053,11 +3141,11 @@ msgstr "Denunciar abuso" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Notificar sobre %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3072,17 +3160,17 @@ msgstr "Notifique su incidencia" msgid "Report, view, or discuss local problems" msgstr "Notifique, consulte o discuta problemas locales" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Notificado anónimamente en %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Notificado con anterioridad" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Notificado por %s en %s" @@ -3096,27 +3184,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Notificado en la categoría %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Notificado anónimamente en la categoría %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Notificado en la categoría %s por %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Notificado anónimamente vía %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Notificado vía %s por %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Notificado anónimamente vía %s en la categoría %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Notificado vía %s en la categoría %s por %s en %s" @@ -3125,8 +3213,8 @@ msgstr "Notificado vía %s en la categoría %s por %s en %s" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3134,10 +3222,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Notificando un problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Notificaciones" @@ -3150,11 +3237,10 @@ msgid "Reports awaiting approval" msgstr "Informes en espera de aprobación" #: templates/web/base/alert/_list.html:54 -#, fuzzy msgid "Reports by destination" -msgstr "Notificado por %s en %s" +msgstr "" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3166,19 +3252,17 @@ msgstr "" msgid "Reports published" msgstr "Notificaciones publicadas" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 -#, fuzzy msgid "Reports sent to %s" -msgstr "Notificar sobre %s" +msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 -#, fuzzy msgid "Reports sent to %s, within %s ward" -msgstr "Listado RSS para %s, en el barrio %s" +msgstr "" #: templates/web/base/admin/index.html:56 msgid "Reports waiting to be sent" @@ -3221,21 +3305,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3254,17 +3339,17 @@ 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:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rotar a la izquierda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Rotar a la derecha" @@ -3274,21 +3359,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satélite" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3299,19 +3384,18 @@ msgstr "Guardar cambios" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:132 -#, fuzzy msgid "Scheduled" -msgstr "Acción programada" +msgstr "" #: templates/web/base/admin/index.html:26 #: templates/web/base/admin/reports.html:1 @@ -3323,7 +3407,7 @@ msgstr "Buscar Notificaciones" msgid "Search Users" msgstr "Buscar Usuarios" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Buscar informes" @@ -3334,6 +3418,7 @@ msgid "Search:" msgstr "Buscar:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "La búsqueda no encontró notificaciones." @@ -3346,7 +3431,7 @@ msgstr "La búsqueda no encontró usuarios." msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3355,8 +3440,8 @@ msgstr "" msgid "Select a body" msgstr "Selecciona un órgano administrativo" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Seleccione un área" @@ -3376,11 +3461,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Enviado a %s %s después" @@ -3389,11 +3479,11 @@ msgid "Sent:" msgstr "Enviado:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Servicio:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3402,9 +3492,9 @@ msgid "Share" msgstr "Compartir" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3412,19 +3502,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3432,40 +3522,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Mostrar mi nombre públicamente" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Mostrar antiguos" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Mostrar marcadores" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3476,12 +3563,16 @@ msgstr "Iniciar sesión" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Iniciar sesión o crear una cuenta" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Salir" @@ -3499,7 +3590,7 @@ msgstr "" "Algunos puntos finales requieren una clave de API para indicar que las notificaciones provienen\n" "de tu sistema FixMyStreet." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Algunas fotos de notificaciones recientes" @@ -3512,15 +3603,19 @@ msgstr "Algún texto para localizar" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3553,20 +3648,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Fecha de inicio:" #: templates/web/base/admin/body.html:73 @@ -3576,18 +3672,20 @@ msgstr "Fecha de inicio:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Estado" -#: templates/web/base/report/update.html:48 -#, fuzzy +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 msgid "State changed to:" -msgstr "Guardar cambios" +msgstr "" #: templates/web/base/admin/report_edit.html:116 #: templates/web/base/admin/update_edit.html:28 @@ -3598,17 +3696,18 @@ msgstr "Guardar cambios" msgid "State:" msgstr "Estado/Prov.:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 -#, fuzzy msgid "States" -msgstr "Estado" +msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Estadísticas" @@ -3618,7 +3717,7 @@ msgstr "Estadísticas" msgid "Status" msgstr "Estado" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Sigue abierta, a través de cuestionario, %s" @@ -3631,7 +3730,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Subcategoria: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Subcategoria: %s" @@ -3648,18 +3752,19 @@ msgstr "Título" msgid "Subject:" msgstr "Título:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Enviar" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3689,9 +3794,8 @@ msgid "Subscribe" msgstr "Suscribirse" #: templates/web/base/alert/_list.html:72 -#, fuzzy msgid "Subscribe by email" -msgstr "Suscríbeme a alertas por email" +msgstr "" #: templates/web/base/report/new/form_report.html:19 msgid "Summarise the problem" @@ -3701,7 +3805,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3709,25 +3813,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Resumen" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Resumen de notificaciones" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Resumen de notificaciones" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Resultados de la Encuesta" @@ -3735,14 +3845,14 @@ msgstr "Resultados de la Encuesta" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Texto" @@ -3750,7 +3860,7 @@ msgstr "Texto" msgid "Text only version" msgstr "Versión solo texto" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3777,7 +3887,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Gracias por su feedback" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Gracias por subir una foto. Ahora necesitamos situar la incidencia, así que por favor escriba el nombre o código postal de una calle cercana en el cuadro de arriba:" @@ -3793,7 +3903,7 @@ msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuev 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo." @@ -3803,11 +3913,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "El problema se ha marcado como enviado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "El problema ahora será reenviado." @@ -3843,8 +3953,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3881,8 +3991,8 @@ msgstr "El ayuntamiento necesita la mayor cantidad de detalles posibles para ate 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:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "El error fue: %s" @@ -3924,7 +4034,7 @@ msgstr "Últimos problemas notificados por los usuarios como arreglados" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Últimos problemas dentro de los límites de {{NAME}} notificados por los usuarios" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3949,7 +4059,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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." @@ -3962,33 +4072,38 @@ msgstr "" "El usuario name aparece públicamente en los informes que no han sido marcados como anónimos.\n" "Los nombres no son necesariamente únicos." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "No hay ninguna notificación que mostrar." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Hubo un problema con su email/contraseña. Si no recuerda o no tiene contraseña, por favor rellene la sección 'registrarme con email' del formulario." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Hubo un problema con su email/contraseña. Por favor, inténtelo de nuevo." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Hubo un problema con su email/contraseña. Si no recuerda o no tiene contraseña, por favor rellene la sección 'registrarme con email' del formulario." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 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." @@ -3996,7 +4111,7 @@ msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo." msgid "There were problems with your report. Please see below." msgstr "Hubo problemas con su notificación. Por favor, vea más abajo." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Hubo problemas con su actualización. Por favor, vea más abajo." @@ -4060,26 +4175,34 @@ 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:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Esta información es necesaria" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Este es un sitio para desarrolladores, las cosas podrían romperse en cualquier momento, y la base de datos se eliminará periódicamente." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4096,7 +4219,7 @@ msgstr "Este problema no se ha arreglado" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4106,23 +4229,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Esta notificación está pendiente de moderación." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Esta notificación está marcada como cerrada." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Esta notificación está marcada como arreglada." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Esta notificación está marcada como abierta." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Esta notificación se ha presentado de forma anónima." -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4133,7 +4256,7 @@ msgstr "Esta página web también contiene una foto del problema, proporcionada msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Cronología" @@ -4145,20 +4268,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Título" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Para saber cuáles son las alertas locales que tenemos para usted, por favor introduzca su código postal o el nombre de la calle y el área" @@ -4170,44 +4294,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 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" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Total" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Total" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4220,18 +4336,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Inténtelo de nuevo" @@ -4246,7 +4363,11 @@ msgstr "Pruebe enviándonos un correo directamente:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4255,15 +4376,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Sin confirmar" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Desconocido" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Tipo de alerta desconocida" @@ -4273,13 +4390,14 @@ msgstr "Tipo de alerta desconocida" msgid "Unknown error" msgstr "Error desconocido" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "ID de problema desconocido" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4304,12 +4422,12 @@ msgstr "La actualización de abajo fue añadida de forma anónima en %s" 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Actualizar órgano" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Actualizar desglose por estado" @@ -4317,16 +4435,16 @@ msgstr "Actualizar desglose por estado" msgid "Update by {{name}}" msgstr "Actualizar por {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "La actualización modificó el estado del problema a %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "La actualización marcó el problema como arreglado" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "La actualización reabrió el problema" @@ -4340,20 +4458,18 @@ msgstr "Actualización de estados" msgid "Updated" msgstr "Actualizado" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 -#, fuzzy +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 msgid "Updated by %s (%s) at %s" -msgstr "Publicado por %s (%s) - %s" +msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 -#, fuzzy +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "Updated by %s at %s" -msgstr "Publicado por %s - %s" +msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4361,7 +4477,7 @@ msgid "Updated!" msgstr "¡Actualizado!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Actualizaciones" @@ -4408,40 +4524,81 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Email añadido a lista de abusones" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Email ya incluido en la lista de abusones" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Usuario marcado" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "¿En tabla de abusones?" #: templates/web/base/admin/users.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." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Usuarios" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Usuarios" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Valores actualizados" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Su dirección de email" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Su número de teléfono" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4463,12 +4620,7 @@ msgstr "Visualizando una ubicación" msgid "Viewing a problem" msgstr "Visualizando un problema" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4478,20 +4630,25 @@ msgstr "Barrios de este ayuntamiento" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Hemos encontrado más de una coincidencia para esa ubicación. Se muestran un máximo de diez. Prueba una búsqueda diferente si no encuentra aquí su ubicación." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Lo sentimos, no hemos podido encontrar ese lugar." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4499,6 +4656,12 @@ msgstr "Somos conscientes de este problema podría ser responsabilidad de %s; si msgid "We send it to the council on your behalf" msgstr "Se lo enviamos al Ayuntamiento en su nombre" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Hemos encontrado más de una coincidencia para esa ubicación. Se muestran un máximo de diez. Prueba una búsqueda diferente si no encuentra aquí su ubicación." + #: 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." @@ -4508,8 +4671,8 @@ msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra MaPit." msgstr "En las búsquedas de solicitudes, es también posible buscar por agency_responsible para limitar las solicitudes a las enviados a una sola administración. El término de búsqueda es el ID de administración proporcionada por MapIT." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está disponible en fixmystreet.org." @@ -4576,16 +4743,7 @@ msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuac msgid "Wrong location? Just click again on the map." msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar correcto." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Año" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4600,7 +4758,7 @@ msgstr "Año" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "SÍ" @@ -4613,7 +4771,7 @@ msgstr "Sí, tengo una contraseña" 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:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4630,7 +4788,7 @@ msgstr "Estás denunciando la siguiente actualización por ser abusiva, contener 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:96 +#: templates/web/base/admin/user-form.html:114 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." @@ -4659,7 +4817,7 @@ 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:93 +#: templates/web/base/admin/body-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." @@ -4667,7 +4825,7 @@ msgstr "Puede marcar un organismo como eliminado si no quiere que aparezca activ 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:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4694,18 +4852,38 @@ msgstr "Ha cerrado la sesión correctamente" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Has ubicado el problema en el punto marcado con el pin verde en el mapa. Si este no es el lugar correcto, simplemente haga clic en el mapa de nuevo. " -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Ha confirmado correctamente su dirección de correo electrónico." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Ha confirmado correctamente su dirección de correo electrónico." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Ha confirmado correctamente su dirección de correo electrónico." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Ha confirmado correctamente su dirección de correo electrónico." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Ha iniciado sesión correctamente, por favor revise y confirme si sus detalles son correctos:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Ha confirmado correctamente su dirección de correo electrónico." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "No ha notificado nada aún. Notifique un problema ahora." @@ -4732,36 +4910,43 @@ msgid "Your Reports" msgstr "Sus notificaciones" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Su email:" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Su dirección de email" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Su dirección de email" + #: 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" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4772,19 +4957,19 @@ msgstr "Su nombre" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4795,8 +4980,8 @@ msgstr "Su contraseña" msgid "Your password has been changed" msgstr "Su contraseña ha cambiado" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Su número de teléfono" @@ -4805,7 +4990,7 @@ msgstr "Su número de teléfono" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Sus notificaciones" @@ -4814,25 +4999,40 @@ msgstr "Sus notificaciones" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Su contraseña ha cambiado" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Sus actualizaciones" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4849,8 +5049,8 @@ msgstr "ayuntamiento" msgid "didn't use map" msgstr "no utilizó mapa" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "por ejemplo, '%s' o '%s'" @@ -4873,23 +5073,23 @@ msgstr "ultima actualización %s" msgid "less than a minute" msgstr "menos de un minuto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" -msgstr "marcado como que el ayuntamiento no es responsable" +msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "o localízame automáticamente" @@ -4926,11 +5126,10 @@ msgid "there is no pin shown as the user did not use the map" msgstr "no hay marcador porque el usuario no usó el mapa" #: templates/web/base/alert/_list.html:1 -#, fuzzy msgid "this location" -msgstr "Visualizando una ubicación" +msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "este tipo de problema local" @@ -4938,11 +5137,11 @@ msgstr "este tipo de problema local" msgid "today" msgstr "hoy" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4950,14 +5149,24 @@ msgstr "" msgid "used map" msgstr "mapa utilizado" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "El usuario es del mismo ayuntamiento que el problema - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "El usuario es el propietario del problema" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Email ya incluido en la lista de abusones" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Email añadido a lista de abusones" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5019,35 +5228,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5117,86 +5326,50 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" -#~ msgid "%s ward, %s" -#~ msgstr "%s barrio, %s" - -#~ msgid "%s, within %s ward" -#~ msgstr "%s, en %s barrio" - -#~ msgid "-- Pick a property type --" -#~ msgstr "-- Escoja un tipo de propiedad --" - -#~ msgid "Closed:" -#~ msgstr "Cerrada:" - -#~ msgid "Duplicate" -#~ msgstr "Duplicado" - -#~ msgid "Fixed:" -#~ msgstr "Arreglado:" - -#~ msgid "Here are the types of local problem alerts for ‘%s’." -#~ msgstr "Estos son los tipos de notificaciones de incidencias locales para '%s'." - -#~ msgid "In Progress" -#~ msgstr "Procesando" - -#~ msgid "Internal referral" -#~ msgstr "Remisión interna" - -#~ msgid "Investigating" -#~ msgstr "Investigando" - -#~ msgid "No further action" -#~ msgstr "Incapaz de arreglarlo" - -#~ msgid "Not Responsible" -#~ msgstr "No responsable" - -#~ msgid "Or problems reported to:" -#~ msgstr "O problemas notificados a:" +#~ msgid "(Email in abuse table)" +#~ msgstr "(email registrado en la tabla de abusos)" -#~ msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" -#~ msgstr "O puede suscribirse a una alerta basada en el barrio o ayuntamiento en que te encuentras:" +#~ msgid "14-30 days old" +#~ msgstr "Antigüedad entre 14-30 días" -#~ msgid "Please choose a property type" -#~ msgstr "Por favor, elija un tipo de propiedad" +#~ msgid "7-14 days old" +#~ msgstr "Antigüedad de 7-14 días " -#~ msgid "Problems within the boundary of:" -#~ msgstr "Problemas en:" +#~ msgid "Average time to council marking fixed (days)" +#~ msgstr "Promedio de tiempo para el arreglo (días)" -#~ msgid "The simplest alert is our geographic one:" -#~ msgstr "La alerta más sencilla es nuestra alerta geográfica:" +#~ msgid "Average time to first council state change (days)" +#~ msgstr "Promedio de tiempo hasta el primer cambio de estado (días)" -#~ msgid "closed as a duplicate report" -#~ msgstr "marcado como un informe duplicado" +#~ msgid "By Date" +#~ msgstr "Por Fecha" -#~ msgid "marked as action scheduled" -#~ msgstr "marcado como acción programada" +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Haga click aqui o introduzca dd/mm/yyyy" -#~ msgid "marked as an internal referral" -#~ msgstr "marcado como una referencia interna" +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Notificaciones confirmadas entre %s y %s" -#~ msgid "marked as closed" -#~ msgstr "marcado como cerrado" +#~ msgid "Hide old" +#~ msgstr "Ocultar antiguos" -#~ msgid "marked as fixed" -#~ msgstr "marcado como arreglado" +#~ msgid "Include unconfirmed reports" +#~ msgstr "Incluir notificaciones no confirmadas" -#~ msgid "marked as in progress" -#~ msgstr "marcado como en progreso" +#~ msgid "Invalid end date" +#~ msgstr "Fecha de fin inválida" -#~ msgid "marked as investigating" -#~ msgstr "marcado como en investigación" +#~ msgid "Invalid start date" +#~ msgstr "Fecha de inicio no válida" -#~ msgid "marked as no further action" -#~ msgstr "marcado como que no se puede arreglar" +#~ msgid "No council" +#~ msgstr "Sin ayuntamiento" -#~ msgid "marked as planned" -#~ msgstr "marcado como planificado" +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Tenga en cuenta que al incluir notificaciones no confirmadas usamos la fecha de creación de la notificación, que puede no coincidir con el mes en se confirmó, así que los números pueden variar un poco." -#~ msgid "or" -#~ msgstr "o" +#~ msgid "Show old" +#~ msgstr "Mostrar antiguos" -#~ msgid "reopened" -#~ msgstr "reabierto" +#~ msgid "Year" +#~ msgstr "Año" diff --git a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po index 35b0bf68c00..3fb11b1c861 100644 --- a/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es_DO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/mysociety/teams/12067/es_DO/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr " y " @@ -32,6 +32,10 @@ msgstr " y " msgid " or " msgstr " o " +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d ediciones por %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s contactos en Ayuntamiento – %s confirmados, %s sin confirmar" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "%s tiene una variedad de feeds RRS y alertas de email para los problemas locales, que incluyen aquellas para todos los problemas dentro de un barrio en particular, o para todos los problemas dentro de una determinada distancia de un lugar en particular." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -86,6 +90,11 @@ msgstr "" msgid "%s live updates" msgstr "%s actualizaciones en vivo" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s cuestionarios enviados – %s respondidos (%s%%)" @@ -94,7 +103,7 @@ msgstr "%s cuestionarios enviados – %s respondidos (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© OpenStreetMap colaboradores" @@ -102,11 +111,6 @@ msgstr "© OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(Defecto & ubicación del defecto)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(email registrado en la tabla de abusos)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -142,7 +146,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(como pintadas, basuras, pavimento o alumbrado rotos)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -164,8 +168,8 @@ msgstr "(enviado a ambos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "Listado RSS de los problemas dentro de %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Escoja una categoría --" @@ -178,14 +182,6 @@ msgstr "--Elija una plantilla--" msgid "10 inch pothole on Example St, near post box" msgstr "Un bache de 25 centímetros en Calle Ejemplo, cerca al buzón de correos" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "14 - 30 días de antigüedad" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "7 - 14 días de antigüedad" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -197,17 +193,17 @@ msgstr "" "Probablemente por eso el \"area cubierta\" está vacía (abajo).
\n" "Por favor añada MAPIT_TYPES en su archivo de configuración." -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -216,33 +212,52 @@ msgstr "" msgid "%s live problems" msgstr "%s notificaciones en curso" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "No- confirmar mi notificación por email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "No- confirmar mi notificación por email" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "No- confirmar mi actualización por email" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "No- confirmar mi actualización por email" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "No- permítanme registrarme por email" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "No- permítanme registrarme por email" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 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." -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Sí- tengo una contraseña" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -259,11 +274,17 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Agregue un órgano" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Suspender este email" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -286,11 +307,17 @@ msgstr "Agregar nueva categoría" msgid "Add option" msgstr "opcional" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Sin 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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "Añadir a la lista de pre-seleccionados" @@ -300,23 +327,23 @@ msgstr "Añadir a la lista de pre-seleccionados" msgid "Add user" msgstr "Añadir un usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "Añadir/editar las categorias del problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "Añadir/Editar las prioridades de respuesta" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "Añadir/Editar las plantillas de respuesta" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Añadido %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 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." @@ -340,9 +367,10 @@ msgstr "Alerta %d desactivada (creada %s)" msgid "Alert me to future updates" msgstr "Notificadme actualizaciones futuras" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -351,12 +379,13 @@ msgstr "" msgid "All Reports" msgstr "Todas las notificaciones" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Todos los informes como CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Todas las categorías" @@ -372,17 +401,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Todas las notificaciones" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Todas las notificaciones entre %s y %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -420,7 +449,8 @@ 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:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "¿Está seguro(a)?" @@ -431,7 +461,7 @@ msgstr "¿Está seguro(a)?" msgid "Area covered" msgstr "Área cubierta" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "Área:" @@ -445,7 +475,7 @@ msgid "Assign to competent body:" msgstr "Asignar al organismo administrativo competente:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Asignar a otra categoria:" @@ -457,7 +487,7 @@ msgstr "Asignar a un órgano externo:" msgid "Assign to subdivision:" msgstr "Asigne a la subdivisión:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "Asignar usuarios a las áreas" @@ -473,12 +503,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 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." -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Respuesta automática:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "Respuesta automática:" @@ -486,18 +521,10 @@ msgstr "Respuesta automática:" msgid "Available categories" msgstr "Categorías disponibles" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "El tiempo promedio de arreglar un problema (en días)" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "El tiempo promedio del primero cambio del estado " - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "Evitar información personal y las placas de matrícula de los carros" @@ -511,20 +538,21 @@ msgstr "En espera de revisión" msgid "Back" msgstr "Atras" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "Volver a todos los informes" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Suspender este email" +#, fuzzy +msgid "Ban user" +msgstr "Marca usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Órganos administrativos" @@ -535,14 +563,10 @@ msgstr "Órganos administrativos" msgid "Body" msgstr "Órgano administrativo" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Órgano administrativo:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Por Fecha" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -555,8 +579,9 @@ 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:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Categorías" @@ -567,30 +592,36 @@ msgstr "Categorías:" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Categoría" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Categoría" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categoría cambiada de ‘%s’ a ‘%s’" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "Ratio de arreglo de problemas > 4 semanas" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -598,17 +629,18 @@ msgstr "Ratio de arreglo de problemas > 4 semanas" msgid "Category:" msgstr "Categoría:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Categoría: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "Cambiar email" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "Cambiar dirección de email" @@ -616,10 +648,16 @@ msgstr "Cambiar dirección de email" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Cambiar contraseña" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Sin número de teléfono)" + #: templates/web/base/admin/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." @@ -650,19 +688,14 @@ 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "Elija otro" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "Eliminar datos sin conexión" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Haga clic aqui o introduzca dd/mm/yyyy" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Haga clic en el mapa para notificar un problema" @@ -691,18 +724,19 @@ msgstr "Haga un clic en nuestro email de confirmación para iniciar sesión." #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Cerrada" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Cerrada por el Ayuntamiento" @@ -717,16 +751,17 @@ msgid "Cobrand" msgstr "Cobrand" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Datos cobrand:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -734,7 +769,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuración" @@ -743,7 +778,7 @@ msgstr "Configuración" msgid "Confirm" msgstr "Confirmar" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Confirmar cuenta" @@ -762,14 +797,10 @@ msgstr "Confirmación" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Confirmado" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Notificaciones confirmadas entre %s y %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -796,8 +827,8 @@ msgstr "Contactar con el equipo" msgid "Coordinates:" msgstr "Coordenadas:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "No se pudo encontrar el usuario" @@ -815,43 +846,16 @@ msgstr "Ayuntamiento" msgid "Council contacts for %s" msgstr "Contactos del ayuntamiento para %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "Referencia del ayuntamiento: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Ayuntamiento:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Total" @@ -873,40 +877,45 @@ msgstr "Crear una categoría" msgid "Create priority" msgstr "Crear prioridad" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "Crear informes/actualizaciones en nombre del usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "Crear informes/actualizaciones como ayuntamiento" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "Crear informes/actualizaciones en nombre del usuario" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Crear plantillas" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Creado" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Creado:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Estado actual" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -917,14 +926,14 @@ msgstr "No se han creado organismos aún." msgid "Customer not contactable" msgstr "Cliente imposible de contactar" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Tablero de control" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Tratado por el departamento dentro de los 5 días hábiles" @@ -937,12 +946,12 @@ msgstr "" msgid "Default priority" msgstr "Crear prioridad" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "Tipo de defecto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Eliminar plantilla" @@ -953,8 +962,8 @@ msgstr "Eliminar plantilla" msgid "Deleted" msgstr "Eliminado" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "Describe el motivo de la moderación" @@ -970,6 +979,10 @@ msgstr "Descripción" msgid "Description:" msgstr "Descripción:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -982,6 +995,10 @@ msgstr "Detalles" msgid "Details:" msgstr "Detalles:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Transferido" @@ -995,8 +1012,8 @@ msgstr "No usó el mapa" msgid "Diligency prize league table" msgstr "Ranking de premios a la constancia" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "Desechar cambios" @@ -1005,7 +1022,7 @@ 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" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1013,7 +1030,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:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1033,11 +1050,11 @@ msgstr "" 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:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1060,9 +1077,10 @@ msgstr "Falso este/Falso norte:" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Editar" @@ -1072,33 +1090,33 @@ msgstr "Editar" msgid "Edit body details" msgstr "Editar los detalles del órgano administrativo" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "Editar los detalles de otros usuarios" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "Editar los permisos de otros usuarios" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "Editar la categoría del informe" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "Editar la prioridad del informe" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "Editar los informes" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Editando el problema %d" @@ -1119,7 +1137,6 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1127,17 +1144,20 @@ msgstr "Editor" msgid "Email" msgstr "Email:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Email añadido a lista de abusones" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "Dirección de email" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Dirección de email" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Creada alerta de email" @@ -1146,19 +1166,18 @@ msgstr "Creada alerta de email" msgid "Email alert deleted" msgstr "Borrada alerta de email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Email ya incluido en la lista de abusones" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Email: %s" @@ -1175,8 +1194,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/body-form.html:123 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" @@ -1186,8 +1205,9 @@ 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Fecha final:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1208,14 +1228,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Introduzca un código postal cercano, o el nombre de la calle y el área" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Introduzca el nombre de una calle cercana" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Introduzca una contraseña" @@ -1233,8 +1253,8 @@ msgstr "Introduzca detalles del problema" msgid "Error" msgstr "Error" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Todo" @@ -1259,7 +1279,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "Explicar el problema" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1275,7 +1295,7 @@ msgstr "Externo" msgid "External ID" msgstr "ID externo" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "URL Externo" @@ -1287,7 +1307,7 @@ msgstr "Organismo administrativo externo" msgid "External team" msgstr "Equipo externo" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1299,7 +1319,7 @@ msgstr "Detalles adicionales" msgid "Extra data:" msgstr "Datos adicionales:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "Detalles adicionales" @@ -1329,21 +1349,22 @@ msgstr "Arreglar esto eligiendo un área cubierta en el formula #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Arreglado" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Arreglado - Ayuntamiento" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Arreglado - Usuario" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Marcar como borrado" @@ -1351,7 +1372,7 @@ msgstr "Marcar como borrado" msgid "Flag user" msgstr "Marca usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Marcado" @@ -1360,7 +1381,7 @@ msgstr "Marcado" msgid "Flagged reports and users" msgstr "Señalizar informes y usuarios" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Los usuarios marcados se listan en página demarcados" @@ -1368,8 +1389,8 @@ msgstr "Los usuarios marcados se listan en página demarcados" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Marcado:" @@ -1389,7 +1410,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Para más información, vea Cómo FixMyStreet usa Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1409,8 +1430,12 @@ msgstr "Deseo reenviado al organismo administrativo externo" msgid "Frequently Asked Questions" msgstr "Listado de Preguntas Frecuentes" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1443,12 +1468,12 @@ msgstr "¡Nos alegra saber que ha sido arreglado!" #: 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Ir" @@ -1456,7 +1481,7 @@ msgstr "Ir" msgid "Going to send questionnaire?" msgstr "¿Va a enviar cuestionario?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "Permitir el acceso al administrador" @@ -1464,6 +1489,15 @@ 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/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "por %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "¿Ha sido corregido este problema?" @@ -1484,21 +1518,26 @@ msgstr "Ayuda" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "Ayuda %spara resolver su problema más rápido, indique detalles adicionales. Esta información adicional no será publicada online." +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Fotos de notificaciones cercanas recientes" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "%s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Oculto" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "Ocultar el reporte entero" @@ -1519,21 +1558,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Ocultar antiguos" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Ocultar marcadores" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "Ocultar actualización entero" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1545,7 +1581,7 @@ msgstr "" msgid "History" msgstr "Historial" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Inicio" @@ -1604,6 +1640,10 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1612,6 +1652,10 @@ 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 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." @@ -1620,7 +1664,7 @@ msgstr "Si usted consigue algo más de información sobre el estado del problema 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." -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Si quiere que esta plantilla sea una opción para categorías específicas, elíjalas aquí. Como valor predeterminado se mostrará para todas las categorías." @@ -1629,7 +1673,7 @@ msgstr "Si quiere que esta plantilla sea una opción para categorías específic msgid "If you submit a problem here the problem will not be reported to the council." msgstr "Si envía un problema aquí, éste será no reportado al ayuntamiento." -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1711,11 +1755,7 @@ msgstr "Bandeja de entrada vacía" msgid "Include reporter personal details" msgstr "Incluir datos del notificador" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Incluir notificaciones no confirmadas" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Valor incorrecto para has_photo \"%s\"" @@ -1727,7 +1767,7 @@ msgstr "" msgid "Inspection required" msgstr "Inspección requerida" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "Dar instrucciones a los contratistas para que solucionen los problemas" @@ -1739,26 +1779,18 @@ msgstr "Notas internas" msgid "Internet glitch" msgstr "Fallo de Internet" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Valor inválido para agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Fecha de fin inválida" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Especificado un formato no válido %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 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." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Fecha de inicio no válida" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "A menudo es más rápido consultar nuestro Listado de Preguntas Frecuentes y ver si la respuesta está allí." @@ -1777,7 +1809,7 @@ msgstr "Jurisdicción Desconocida" msgid "Jurisdiction unknown" msgstr "Jurisdicción desconocida" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1802,12 +1834,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "Hace 4 semanas" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1833,18 +1860,14 @@ msgstr "Última actualización:" msgid "Latitude/Longitude:" msgstr "Latitud/Longitud:" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "Menos recientemente actualizado" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "Menos de 7 días de antigüedad" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1853,13 +1876,13 @@ msgstr "" msgid "List all reported problems" msgstr "Listar todos los problemas notificados" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Cargando..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1891,12 +1914,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:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "Iniciar sesión con email" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +#, fuzzy +msgid "Log in with email/text" +msgstr "Iniciar sesión con email" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "Buscar" @@ -1904,11 +1931,11 @@ msgstr "Buscar" msgid "MAP" msgstr "MAPA" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "Administrar los pre-seleccionados" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1920,11 +1947,11 @@ msgstr " Mapa" msgid "Mark as sent" msgstr "Marcado como enviado" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 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:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "Marcar los detalles del problema" @@ -1944,45 +1971,45 @@ msgstr "Mensaje al organismo administrativo externo:" msgid "Missing bodies:" msgstr "Organismos administrativos perdidos:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Falta jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "Moderar" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "Moderar los detalles del informe" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "Moderar este informe" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "Moderar este actualización" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "Moderado por %s a %s" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Moderado por el organismo durante el siguiente día laborable" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "Motivo de moderación" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Mes" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "Lo más comentado" @@ -2000,9 +2027,9 @@ msgstr "Lo más comentado" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2013,19 +2040,24 @@ msgstr "Nombre" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Nombre:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Nombre: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "Navegue a este problema" +#: templates/web/base/report/_inspect.html:39 +#, fuzzy +msgid "Nearest calculated address:" +msgstr "Nueva dirección de email:" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2035,12 +2067,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2056,20 +2088,25 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "¡Casi hemos terminado! Lea su email…" +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "¡Casi hemos terminado! Lea su email…" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 #, fuzzy msgid "New" msgstr "Lo más reciente" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Nuevo organismo añadido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Añadida nueva categoría de contactos" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "Nueva dirección de email:" @@ -2090,6 +2127,11 @@ msgstr "Nota nueva al DM:" msgid "New password:" msgstr "Contraseña nueva:" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Sin número de teléfono)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2119,18 +2161,19 @@ msgstr "Nuevos reportes en los límites de {{NAME}} en CuidoMiCiudad" msgid "New reports" msgstr "Nuevos informes" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Nuevo estado" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Plantilla nueva" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "Lo más reciente" @@ -2138,7 +2181,7 @@ msgstr "Lo más reciente" msgid "Next" msgstr "Siguiente" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2150,22 +2193,18 @@ msgstr "Siguiente" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "No" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Sin área" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Sin órgano administrativo" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Sin ayuntamiento" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Ningún ayuntamiento seleccionado" @@ -2195,6 +2234,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Ningún resultado devuelto" @@ -2219,8 +2262,8 @@ msgstr "No hay seguidores" msgid "None" msgstr "Nada" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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." @@ -2228,8 +2271,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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2252,7 +2295,7 @@ msgstr "Imposible de contactar" msgid "Not for my subdivision" msgstr "No para mi subdivisión" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "No notificado anteriormente" @@ -2266,10 +2309,6 @@ msgstr "No comunicado al ayuntamiento" msgid "Note" msgstr "Nota" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Tenga en cuenta que al incluir notificaciones no confirmadas usamos la fecha de creación de la notificación, que puede no coincidir con el mes en se confirmó, así que los números pueden variar un poco." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2297,37 +2336,46 @@ msgstr "Ahora a enviar tu notificación…" msgid "Now to submit your update…" msgstr "Ahora a enviar tu notificación…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "Datos sin conexión eliminados" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Estado antiguo" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "Lo más antiguo" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2367,23 +2415,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Otros" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "otras áreas:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2401,19 +2456,19 @@ msgstr "Página no encontrada" msgid "Parent" msgstr "Padre" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Contraseña (opcional)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Contraseña:" @@ -2421,7 +2476,7 @@ msgstr "Contraseña:" msgid "Permalink" msgstr "Enlace permanente" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "Licencias:" @@ -2430,19 +2485,25 @@ msgstr "Licencias:" msgid "Phone Reporter:" msgstr "Notificado:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Número de teléfono" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Número de teléfono (opcional)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Notificado:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Teléfono:" @@ -2458,7 +2519,7 @@ msgstr "Teléfono:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2484,12 +2545,17 @@ msgstr "Fotos" msgid "Photos of recent nearby reports" msgstr "Fotos de notificaciones cercanas recientes" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Coloque el marcador en el mapa" @@ -2511,25 +2577,34 @@ msgstr "Por favor, sea cortés, conciso y vaya al grano." msgid "Please check the passwords and try again" msgstr "Por favor, comprueba la contraseña e inténtalo de nuevo" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Por favor, compruebe que su dirección de email es correcta" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Por favor, elija una categoría" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Por favor, corrija los errores a continuación" @@ -2544,39 +2619,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Por favor escriba su mensaje." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Por favor, introduzca su número de telefono" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "Por favor, indique un nombre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "Por favor, indique un nombre para este organismo" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Por favor, introduzca una contraseña" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Por favor, introduzca un título" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Por favor, introduce una dirección de email válida" @@ -2585,55 +2668,62 @@ msgstr "Por favor, introduce una dirección de email válida" msgid "Please enter a valid email address" msgstr "Por favor, introduce una dirección de email válida" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Por favor, introduzca su número de telefono" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Por favor, describa los detalles más relevantes" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Por favor, introduzca su dirección de email" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Por favor introduzca su email" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Por favor, indique su nombre" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Por favor, introduzca su nombre" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Por favor, introduzca su número de telefono" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Introduzca su segundo nombre" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Por favor, introduzca su título" @@ -2682,7 +2772,12 @@ 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:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Por favor, proveer una actualización pública para este reporte." + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "Por favor, proveer una actualización pública para este reporte." @@ -2722,6 +2817,11 @@ msgstr "Por favor, indique si el problema se ha solucionado" msgid "Please upload an image only" msgstr "Por favor, suba solo una imagen" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Por favor, escriba un mensaje" @@ -2731,7 +2831,7 @@ msgid "Please write your update here" msgstr "Por favor, escriba su actualización aquí" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Publicar" @@ -2740,15 +2840,15 @@ msgstr "Publicar" msgid "Posted anonymously at %s" msgstr "Publicado de forma anónima - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Publicado por %s - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Publicado por %s (%s) - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Publicado por %s - %s" @@ -2760,11 +2860,11 @@ msgstr "Con la tecnología de API para indicar que las notificaciones provienen\n" "de tu sistema CuidoMiCiudad." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Algunas fotos de notificaciones recientes" @@ -3526,15 +3639,20 @@ msgstr "Algún texto para localizar" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "Lo sentimos, este no fue’ un enlace válido" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "Lo sentimos, este no fue’ un enlace válido" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3567,20 +3685,21 @@ 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:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "Seleccionado por" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 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:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "Personal:" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Fecha de inicio:" #: templates/web/base/admin/body.html:73 @@ -3590,15 +3709,18 @@ msgstr "Fecha de inicio:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Estado" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Guardar cambios" @@ -3612,17 +3734,19 @@ msgstr "Guardar cambios" msgid "State:" msgstr "Estado/Prov.:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Estado" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Estadísticas" @@ -3632,7 +3756,7 @@ msgstr "Estadísticas" msgid "Status" msgstr "Estado" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Sigue abierta, a través de cuestionario, %s" @@ -3645,7 +3769,12 @@ msgstr "Vista de calle" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Subcategoria: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Subcategoria: %s" @@ -3662,18 +3791,19 @@ msgstr "Título" msgid "Subject:" msgstr "Título:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Enviar" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3715,7 +3845,7 @@ msgstr "Resuma el problema" msgid "Summarise your changes" msgstr "Resuma sus cambios" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3723,25 +3853,31 @@ msgstr "Resuma sus cambios" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Resumen" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Resumen de notificaciones" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Resumen de notificaciones" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "Súperusuario:" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 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." -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Resultados de la Encuesta" @@ -3749,14 +3885,14 @@ msgstr "Resultados de la Encuesta" msgid "Template «%s»" msgstr "Plantilla «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Plantillas" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Texto" @@ -3764,7 +3900,7 @@ msgstr "Texto" msgid "Text only version" msgstr "Versión solo texto" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3791,7 +3927,7 @@ msgstr "Gracias por su consulta" msgid "Thank you for your feedback" msgstr "Gracias por su feedback" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Gracias por subir una foto. Ahora necesitamos situar la incidencia, así que por favor escriba el nombre o código postal de una calle cercana en el cuadro de arriba:" @@ -3807,7 +3943,7 @@ msgstr "La imagen no ha cargado correctamente (%s), por favor inténtelo de nuev 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo." @@ -3817,11 +3953,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "El problema se ha marcado como enviado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "El problema ahora será reenviado." @@ -3857,8 +3993,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3895,8 +4031,8 @@ msgstr "El ayuntamiento necesita la mayor cantidad de detalles posibles para ate 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:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "El error fue: %s" @@ -3938,7 +4074,7 @@ msgstr "Últimos problemas notificados por los usuarios como arreglados" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Últimos problemas dentro de los límites de {{NAME}} notificados por los usuarios" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 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." @@ -3963,7 +4099,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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." @@ -3976,33 +4112,38 @@ msgstr "" "El usuario name aparece públicamente en los informes que no han sido marcados como anónimos.\n" "Los nombres no son necesariamente únicos." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "No hay ninguna notificación que mostrar." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Hubo un problema con su email/contraseña. Si no recuerda o no tiene contraseña, por favor rellene la sección 'registrarme con email' del formulario." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Hubo un problema con su email/contraseña. Por favor, inténtelo de nuevo." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Hubo un problema con su email/contraseña. Si no recuerda o no tiene contraseña, por favor rellene la sección 'registrarme con email' del formulario." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 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." @@ -4010,7 +4151,7 @@ msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo." msgid "There were problems with your report. Please see below." msgstr "Hubo problemas con su notificación. Por favor, vea más abajo." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Hubo problemas con su actualización. Por favor, vea más abajo." @@ -4074,26 +4215,34 @@ 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:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Esta información es necesaria" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Este es un sitio para desarrolladores, las cosas podrían romperse en cualquier momento, y la base de datos se eliminará periódicamente." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "Este bache ha estado aquí dos meses y ..." @@ -4110,7 +4259,7 @@ msgstr "Este problema no se ha arreglado" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: 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:" @@ -4120,23 +4269,23 @@ msgstr "Ese reporte es duplicado. Por favor, actualizar el reporte original:" msgid "This report is awaiting moderation." msgstr "Esta notificación está pendiente de moderación." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Esta notificación está marcada como cerrada." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Esta notificación está marcada como arreglada." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Esta notificación está marcada como abierta." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Esta notificación se ha presentado de forma anónima." -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4147,7 +4296,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Cronología" @@ -4159,20 +4308,21 @@ msgstr "Tips para fotos perfectas" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Título" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Título:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "Para averiguar cuáles alertas locales tenemos para usted, por favor escriba su %s de código postal o el nombre de la calle y área:" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Para saber cuáles son las alertas locales que tenemos para usted, por favor introduzca su código postal o el nombre de la calle y el área" @@ -4184,44 +4334,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 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" -#: templates/web/base/reports/index.html:97 +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" +msgstr "" + +#: templates/web/base/reports/index.html:126 msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/reports/index.html:83 +#: templates/web/base/reports/index.html:111 msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Total" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" -msgstr "Total señalado" - -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" -msgstr "Total sin señalización" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "Total de reporte recibidos" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Total" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "¿Se necesita administración del tráfico?" @@ -4234,18 +4376,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "Confiables por los organismos administrativos:" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 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:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "Acreditado:" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Inténtelo de nuevo" @@ -4260,7 +4403,11 @@ msgstr "Pruebe enviándonos un correo directamente:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4269,15 +4416,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Sin confirmar" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "Informes sin arreglar" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Desconocido" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Tipo de alerta desconocida" @@ -4287,13 +4430,14 @@ msgstr "Tipo de alerta desconocida" msgid "Unknown error" msgstr "Error desconocido" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "ID de problema desconocido" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4318,12 +4462,12 @@ msgstr "La actualización de abajo fue añadida de forma anónima en %s" 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Actualizar órgano" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Actualizar desglose por estado" @@ -4331,16 +4475,16 @@ msgstr "Actualizar desglose por estado" msgid "Update by {{name}}" msgstr "Actualizar por {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "La actualización modificó el estado del problema a %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "La actualización marcó el problema como arreglado" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "La actualización reabrió el problema" @@ -4354,20 +4498,20 @@ msgstr "Actualización de estados" msgid "Updated" msgstr "Actualizado" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Publicado por %s (%s) - %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Publicado por %s - %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4375,7 +4519,7 @@ msgid "Updated!" msgstr "¡Actualizado!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Actualizaciones" @@ -4422,40 +4566,81 @@ msgstr "Mapa usado" msgid "User ID to attribute fetched comments to" msgstr "ID de usuario a quien atribuir los comentarios obtenidos" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Email añadido a lista de abusones" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Email ya incluido en la lista de abusones" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Usuario marcado" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "¿En tabla de abusones?" #: templates/web/base/admin/users.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." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Usuarios" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Usuarios" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 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:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Valores actualizados" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Nueva dirección de email:" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Su número de teléfono" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4477,12 +4662,7 @@ msgstr "Visualizando una ubicación" msgid "Viewing a problem" msgstr "Visualizando un problema" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "La semana pasada" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4492,20 +4672,25 @@ msgstr "Barrios de este ayuntamiento" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Hemos encontrado más de una coincidencia para esa ubicación. Se muestran un máximo de diez. Prueba una búsqueda diferente si no encuentra aquí su ubicación." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Hemos encontrado más de una coincidencia para el problema de referencia:" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "Hemos encontrado más de una coincidencia para el problema de referencia:" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 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:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4513,6 +4698,12 @@ msgstr "Somos conscientes de este problema podría ser responsabilidad de %s; si msgid "We send it to the council on your behalf" msgstr "Se lo enviamos al Ayuntamiento en su nombre" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Hemos encontrado más de una coincidencia para esa ubicación. Se muestran un máximo de diez. Prueba una búsqueda diferente si no encuentra aquí su ubicación." + #: 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." @@ -4522,9 +4713,9 @@ msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra MaPit." msgstr "En las búsquedas de solicitudes, es también posible buscar por agency_responsible para limitar las solicitudes a las enviados a una sola administración. El término de búsqueda es el ID de administración proporcionada por MapIT." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "¿Quieres contribuir a mejorar FixMyStreet? Nuestro código es abierto y está disponible en fixmystreet.org." @@ -4590,16 +4785,7 @@ msgstr "Escribir su mensaje completamente en mayúsculas o sin signos de puntuac msgid "Wrong location? Just click again on the map." msgstr "¿Ubicación incorrecta? Haga clic de nuevo en el mapa, en el lugar correcto." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "El año pasado" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Año" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4614,7 +4800,7 @@ msgstr "Año" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "SÍ" @@ -4627,7 +4813,7 @@ msgstr "Sí, tengo una contraseña" 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:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "Está sin conexion" @@ -4644,7 +4830,7 @@ msgstr "Estás denunciando la siguiente actualización por ser abusiva, contener 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:96 +#: templates/web/base/admin/user-form.html:114 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." @@ -4673,7 +4859,7 @@ 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:93 +#: templates/web/base/admin/body-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." @@ -4681,7 +4867,7 @@ msgstr "Puede marcar un organismo como eliminado si no quiere que aparezca activ 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:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4708,18 +4894,38 @@ msgstr "Ha cerrado la sesión correctamente" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Has ubicado el problema en el punto marcado con el pin verde en el mapa. Si este no es el lugar correcto, simplemente haga clic en el mapa de nuevo. " -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Ha confirmado correctamente su dirección de correo electrónico." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Ha confirmado correctamente su dirección de correo electrónico." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Ha confirmado correctamente su dirección de correo electrónico." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Ha confirmado correctamente su dirección de correo electrónico." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Ha iniciado sesión correctamente, por favor revise y confirme si sus detalles son correctos:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Ha confirmado correctamente su dirección de correo electrónico." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "No ha notificado nada aún. Notifique un problema ahora." @@ -4746,36 +4952,43 @@ msgid "Your Reports" msgstr "Sus notificaciones" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "Su cuenta" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Su email:" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Su dirección de email" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Su dirección de email" + #: 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" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4786,19 +4999,19 @@ msgstr "Su nombre" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4809,8 +5022,8 @@ msgstr "Su contraseña" msgid "Your password has been changed" msgstr "Su contraseña ha cambiado" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Su número de teléfono" @@ -4819,7 +5032,7 @@ msgstr "Su número de teléfono" msgid "Your report" msgstr "Su informe" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Sus notificaciones" @@ -4828,25 +5041,40 @@ msgstr "Sus notificaciones" msgid "Your shortlist" msgstr "Sus pre-seleccionados" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Su contraseña ha cambiado" + +#: templates/web/base/js/translation_strings.html:70 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." -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Sus actualizaciones" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "Usted mismo" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "todo" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4863,8 +5091,8 @@ msgstr "ayuntamiento" msgid "didn't use map" msgstr "no utilizó mapa" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "por ejemplo, '%s' o '%s'" @@ -4887,23 +5115,24 @@ msgstr "ultima actualización %s" msgid "less than a minute" msgstr "menos de un minuto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "nada" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "marcado como que el ayuntamiento no es responsable" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "o localízame automáticamente" @@ -4944,7 +5173,7 @@ msgstr "no hay marcador porque el usuario no usó el mapa" msgid "this location" msgstr "Visualizando una ubicación" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "este tipo de problema local" @@ -4952,11 +5181,11 @@ msgstr "este tipo de problema local" msgid "today" msgstr "hoy" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4964,14 +5193,24 @@ msgstr "" msgid "used map" msgstr "mapa utilizado" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "El usuario es del mismo ayuntamiento que el problema - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "El usuario es el propietario del problema" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Email ya incluido en la lista de abusones" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Eliminar de los pre-seleccionados" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5033,35 +5272,35 @@ msgid_plural "%d years" msgstr[0] "%d año" msgstr[1] "%d años" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5131,6 +5370,81 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(email registrado en la tabla de abusos)" + +#~ msgid "14-30 days old" +#~ msgstr "14 - 30 días de antigüedad" + +#~ msgid "7-14 days old" +#~ msgstr "7 - 14 días de antigüedad" + +#~ msgid "Average time to council marking fixed (days)" +#~ msgstr "El tiempo promedio de arreglar un problema (en días)" + +#~ msgid "Average time to first council state change (days)" +#~ msgstr "El tiempo promedio del primero cambio del estado " + +#~ msgid "By Date" +#~ msgstr "Por Fecha" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Haga clic aqui o introduzca dd/mm/yyyy" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Notificaciones confirmadas entre %s y %s" + +#~ msgid "Hide old" +#~ msgstr "Ocultar antiguos" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Incluir notificaciones no confirmadas" + +#~ msgid "Invalid end date" +#~ msgstr "Fecha de fin inválida" + +#~ msgid "Invalid start date" +#~ msgstr "Fecha de inicio no válida" + +#~ msgid "Last 4 weeks" +#~ msgstr "Hace 4 semanas" + +#~ msgid "Less than 7 days old" +#~ msgstr "Menos de 7 días de antigüedad" + +#~ msgid "No council" +#~ msgstr "Sin ayuntamiento" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Tenga en cuenta que al incluir notificaciones no confirmadas usamos la fecha de creación de la notificación, que puede no coincidir con el mes en se confirmó, así que los números pueden variar un poco." + +#~ msgid "Show old" +#~ msgstr "Mostrar antiguos" + +#~ msgid "Total marked" +#~ msgstr "Total señalado" + +#~ msgid "Total not marked" +#~ msgstr "Total sin señalización" + +#~ msgid "Total reports received" +#~ msgstr "Total de reporte recibidos" + +#~ msgid "Unfixed reports" +#~ msgstr "Informes sin arreglar" + +#~ msgid "WTD" +#~ msgstr "La semana pasada" + +#~ msgid "Week To Date" +#~ msgstr "La semana pasada" + +#~ msgid "YTD" +#~ msgstr "El año pasado" + +#~ msgid "Year" +#~ msgstr "Año" + #~ msgid "" #~ "%s sends different categories of problem\n" #~ "to the appropriate council, so problems within the boundary of a particular council\n" diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po index e96147d5683..1bbd18301c3 100644 --- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: mySociety , 2017\n" +"Last-Translator: fixmystreetfr , 2017\n" "Language-Team: French (France) (https://www.transifex.com/mysociety/teams/12067/fr_FR/)\n" "Language: fr_FR\n" "MIME-Version: 1.0\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr " et " @@ -32,6 +32,10 @@ msgstr " et " msgid " or " msgstr " ou " +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d changements par %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s contacts administratifs – %s confirmés, %s non confirmés" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -75,7 +79,7 @@ msgstr "" "problèmes à une certaine distance d'un lieu particulier." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -89,6 +93,11 @@ msgstr "" msgid "%s live updates" msgstr "%s mises à jour en temps réel" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s questionnaires envoyés – %s complétés (%s%%)" @@ -97,7 +106,7 @@ msgstr "%s questionnaires envoyés – %s complétés (%s%%)" msgid "%s ref: %s" msgstr "%s réf : %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© OpenStreetMap contributeurs" @@ -105,11 +114,6 @@ msgstr "© OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(Défaut & amp; emplacement du défaut)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(email dans la liste des abus)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -122,16 +126,15 @@ msgstr "(Sans numéro de téléphone)" #: templates/web/base/admin/states/index.html:95 msgid "(a-z and space only)" -msgstr "" +msgstr "(Touches a-z et espace uniquement)" #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(fermé)" #: templates/web/base/alert/_list.html:30 -#, fuzzy msgid "(covers roughly 200,000 people)" -msgstr "(une distance par défaut qui couvre environ 200 000 personnes)" +msgstr "(couvre environ 200 000 personnes)" #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" @@ -139,15 +142,15 @@ msgstr "(résolu)" #: templates/web/base/admin/extra-metadata-form.html:53 msgid "(ignored if type is \"String\")" -msgstr "" +msgstr "(ignoré si le type est \"String\")" #: templates/web/base/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(comme des graffitis, immondices, trottoirs abimés ou éclairage public)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" -msgstr "" +msgstr "(n'existe plus)" #: templates/web/base/report/_item.html:70 msgid "(not sent to council)" @@ -163,12 +166,11 @@ msgstr "(envoyé aux deux)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:36 -#, fuzzy msgid "(we also have RSS feeds for problems within %s)" -msgstr "Flux RSS des problèmes à l'intérieur de %s" +msgstr "(nous avons également des flux RSS pour les problèmes internes%s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Choisissez une catégorie --" @@ -181,14 +183,6 @@ msgstr "--Choisissez un modèle--" msgid "10 inch pothole on Example St, near post box" msgstr "Nid de poule de 10cm près de la boîte postale" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -200,52 +194,70 @@ msgstr "" " Cela est probablement la raison pour laquelle \"zone couverte\" est vide (dessous).
\n" " Peut etre ajouter un MAPIT_TYPES a votre fichier de config?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 msgid "

Reports, Statistics and Actions for

%s

" -msgstr "" +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:48 -#, fuzzy +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" -msgstr " %s %s" +msgstr " %s les rapports %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." -msgstr "" +msgstr "%senregistré." #: templates/web/base/status/stats.html:18 #: templates/web/zurich/admin/index.html:4 msgid "%s live problems" msgstr "%s problèmes actifs" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Non, laissez-moi confirmer mon rapport par email :" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Non, laissez-moi confirmer mon rapport par email :" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Non, laissez-moi confirmer ma mise à jour par email :" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Non, laissez-moi confirmer ma mise à jour par email :" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Non, laissez-moi m'authentifier par email :" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Non, laissez-moi m'authentifier par email :" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 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." -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Oui, j'ai un mot de passe :" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -262,22 +274,28 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Ajouter un interlocuteur" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Bannir l'adresse mail" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" -msgstr "" +msgstr "Ajouter des champs supplémentaires" #: templates/web/base/admin/extra-metadata-form.html:79 msgid "Add field" -msgstr "" +msgstr "Ajouter un champ" #: templates/web/base/admin/states/index.html:85 msgid "Add fixed state" -msgstr "" +msgstr "Ajouter un état fixe" #: templates/web/base/admin/body.html:126 #: templates/web/zurich/admin/body.html:31 @@ -285,15 +303,20 @@ msgid "Add new category" msgstr "Ajouter une nouvelle catégorie" #: templates/web/base/admin/extra-metadata-form.html:72 -#, fuzzy msgid "Add option" -msgstr "optionnel" +msgstr "Ajouter une option" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Sans numéro de téléphone)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "Ajouter à la liste" @@ -303,29 +326,29 @@ msgstr "Ajouter à la liste" msgid "Add user" msgstr "Ajouter un utilisateur" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "Ajouter/modifier des catégories de problèmes" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "Ajouter/modifier les priorités de réponse" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "Ajouter/modifier des modèles de réponse" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Ajouté %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 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." #: templates/web/base/main_nav_items.html:47 msgid "Admin" -msgstr "" +msgstr "Admin" #: templates/web/base/auth/change_password.html:39 msgid "Again:" @@ -343,55 +366,56 @@ msgstr "Alerte %d désactivée (création %s)" msgid "Alert me to future updates" msgstr "M'alerter de futures mises à jour" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" -msgstr "" +msgstr "Tous" #: templates/web/zurich/reports/index.html:13 msgid "All Reports" msgstr "Tous les rapports" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Tous les rapports au format CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Toutes catégories" #: templates/web/base/admin/reportextrafields/edit.html:26 -#, fuzzy msgid "All cobrands" -msgstr "Collaboration" +msgstr "" #: templates/web/base/admin/reportextrafields/edit.html:47 msgid "All languages" -msgstr "" +msgstr "Toutes les langues" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Tous les rapports" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Tous les rapports entre %s et %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" -msgstr "" +msgstr "Tout le temps" #: 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 "" +msgstr "Alternativement, nous pouvons cacher votre nom sur tous vos rapports et mises à jour sur le site:" #: templates/web/base/questionnaire/index.html:47 msgid "An update marked this problem as fixed." @@ -404,9 +428,8 @@ msgstr "Anonyme" #: templates/web/base/report/new/form_user_loggedin.html:21 #: templates/web/base/report/update/form_name.html:17 -#, fuzzy msgid "Anonymous user" -msgstr "Anonyme" +msgstr "Utilisateur anonyme" #: templates/web/base/admin/report_edit.html:122 #: templates/web/base/admin/update_edit.html:23 @@ -423,7 +446,8 @@ 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:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Êtes-vous sûr ?" @@ -434,7 +458,7 @@ msgstr "Êtes-vous sûr ?" msgid "Area covered" msgstr "Zone couverte" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "Région:" @@ -448,7 +472,7 @@ msgid "Assign to competent body:" msgstr "Attribuer à l'organisme compétent:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Affecté à une catégorie différente:" @@ -460,7 +484,7 @@ msgstr "Affecté à un \"interlocuteur\" externe:" msgid "Assign to subdivision:" msgstr "Affecté à la subdivision:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "Affecter des utilisateurs aux zones" @@ -476,12 +500,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 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." -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Réponse automatique:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "Réponse automatique:" @@ -489,17 +518,9 @@ msgstr "Réponse automatique:" msgid "Available categories" msgstr "Catégories disponibles" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." -msgstr "" - -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" +msgstr "Temps moyen entre un problème signalé et corrigé sur les 100 derniers rapports." #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" @@ -514,20 +535,21 @@ msgstr "En attente de modération" msgid "Back" msgstr "Retour" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "Retour vers tous les rapports" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Bannir l'adresse mail" +#, fuzzy +msgid "Ban user" +msgstr "Signaler l'usager" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Interlocuteurs" @@ -538,17 +560,13 @@ msgstr "Interlocuteurs" msgid "Body" msgstr "Interlocuteur" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Interlocuteur:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Par Date" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" -msgstr "" +msgstr "Peut être utilisé pour afficher du texte supplémentaire à l'utilisateur le long du champ. Le modèle par défaut ne montre pas ceci (meta.datatype_description), vous devez l’ajouter category_extras_fields.html" #: templates/web/base/auth/token.html:27 templates/web/base/email_sent.html:20 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." @@ -558,8 +576,9 @@ 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:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Catégories" @@ -570,30 +589,36 @@ msgstr "Catégories:" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Catégorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Catégorie" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Changement de catégorie de ‘%s’ à ‘%s’" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -601,17 +626,18 @@ msgstr "Taux de résolution pour les problèmes > 4 semaines" msgid "Category:" msgstr "Catégorie :" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Catégorie : %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "Changer l'e-mail" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "Changer l'adresse email" @@ -619,10 +645,16 @@ msgstr "Changer l'adresse email" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Changer le mot de passe" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Sans numéro de téléphone)" + #: templates/web/base/admin/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." @@ -654,18 +686,13 @@ 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" -msgstr "" +msgstr "Choisissez un autre" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" -msgstr "" - -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Cliquer ici ou saisir au format jj/mm/aaaa" +msgstr "Effacer les données hors ligne" #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" @@ -688,25 +715,25 @@ msgid "Click the link in our confirmation email to sign in." msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connecter." #: templates/web/base/auth/token.html:20 -#, fuzzy msgid "Click the link in that email to sign in." -msgstr "Cliquez sur le lien dans notre courriel de confirmation pour vous connecter." +msgstr "Cliquez sur le lien dans ce courrier électronique pour vous connecter." #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Clos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Clos par l'administration" @@ -721,24 +748,25 @@ msgid "Cobrand" msgstr "Collaboration" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Données de collaboration :" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Collaboration :" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" -msgstr "" +msgstr "Code" #: templates/web/base/js/translation_strings.html:50 msgid "Collapse map" -msgstr "" +msgstr "Réduire la carte" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuration" @@ -747,7 +775,7 @@ msgstr "Configuration" msgid "Confirm" msgstr "Confirmer" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Confirmer le compte" @@ -766,14 +794,10 @@ msgstr "Confirmation" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Confirmé" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Rapports confirmés entre %s et %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -800,8 +824,8 @@ msgstr "Contacter l'équipe" msgid "Coordinates:" msgstr "Coordonnées:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Impossible de trouver l'utilisateur" @@ -819,50 +843,22 @@ msgstr "Administration" msgid "Council contacts for %s" msgstr "Contacts de l'administration pour %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "Ref. de la mairie : %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Administration :" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Nombre" #: templates/web/base/admin/states/index.html:114 -#, fuzzy msgid "Create" -msgstr "Créé" +msgstr "Créer" #: templates/web/base/email_sent.html:1 msgid "Create a report" @@ -877,40 +873,44 @@ msgstr "Créer une catégorie" msgid "Create priority" msgstr "Créer une priorité" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 -#, fuzzy +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" -msgstr "Créer des rapports/mises à jour pour le compte d'un utilisateur" +msgstr "Créer un rapports / une mises à jour en tant qu'utilisateur anonyme" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "Créer des rapports/mises à jour de l'administration" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "Créer des rapports/mises à jour pour le compte d'un utilisateur" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Créer un modèle" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Créé" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Créé :" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "État actuel" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -921,32 +921,31 @@ msgstr "Pour l'instant, aucun intelocuteur n'a été créé." msgid "Customer not contactable" msgstr "Le client est injoignable" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Tableau de bord" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Traité par la subdivision dans les 5 jours ouvrables" #: templates/web/base/admin/responsepriorities/list.html:9 msgid "Default" -msgstr "" +msgstr "Défaut" #: templates/web/base/admin/responsepriorities/edit.html:39 -#, fuzzy msgid "Default priority" -msgstr "Créer une priorité" +msgstr "Priorité par défaut" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" -msgstr "" +msgstr "Type de défaut" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Supprimer le modèle" @@ -957,10 +956,10 @@ msgstr "Supprimer le modèle" msgid "Deleted" msgstr "Effacé" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" -msgstr "" +msgstr "Décrivez pourquoi vous modérez ceci" #: templates/web/base/admin/extra-metadata-form.html:32 #: templates/web/base/admin/responsepriorities/list.html:7 @@ -974,6 +973,10 @@ msgstr "Description" msgid "Description:" msgstr "Description :" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -986,6 +989,10 @@ msgstr "Détails :" msgid "Details:" msgstr "Détails :" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Transféré(e)" @@ -999,17 +1006,17 @@ msgstr "Ne pas utiliser la carte" msgid "Diligency prize league table" msgstr "Tableau d'honneur de la réactivité" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" -msgstr "" +msgstr "Annuler les modifications" #: templates/web/base/admin/open311-form-fields.html:95 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" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1017,9 +1024,9 @@ 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:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" -msgstr "" +msgstr "Voulez-vous élever automatiquement un défaut?" #: templates/web/base/questionnaire/index.html:57 msgid "Don’t know" @@ -1031,19 +1038,19 @@ msgstr "Vous n'aimez pas les formulaires ?" #: templates/web/base/report/_item.html:27 msgid "Down one" -msgstr "" +msgstr "En bas d'un" #: templates/web/base/js/translation_strings.html:58 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:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" -msgstr "" +msgstr "Dupliquer de" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" -msgstr "" +msgstr "Dupliqués" #: templates/web/base/admin/body.html:116 msgid "" @@ -1064,9 +1071,10 @@ msgstr "Abscisse/Ordonnée :" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Éditer" @@ -1076,33 +1084,33 @@ msgstr "Éditer" msgid "Edit body details" msgstr "Editer les détails de l'intelocuteur" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "Modifier les détails des autres utilisateurs" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "Modifier les autorisations des autres utilisateurs" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "Éditer la catégorie des rapports" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "Éditer la priorité des rapports" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "Éditer les rapports" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Édition du problème %d" @@ -1123,7 +1131,6 @@ msgstr "Éditeur" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1131,17 +1138,20 @@ msgstr "Éditeur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Email rajouté à la liste des abus" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "Adresse e-mail" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Adresse e-mail" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Alerte E-mail créé" @@ -1150,19 +1160,18 @@ msgstr "Alerte E-mail créé" msgid "Email alert deleted" msgstr "Alerte E-mail supprimé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Email déjà présent dans la liste des abus" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Email :" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Courriel: %s" @@ -1178,8 +1187,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/body-form.html:123 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" @@ -1189,8 +1198,9 @@ 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Date de fin:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1211,14 +1221,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Saisir un code postal proche, ou une rue et une localité" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Saisissez un nom de rue proche, la localité ou le code postal" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Saisissez un mot de passe :" @@ -1236,8 +1246,8 @@ msgstr "Saisissez les détails du problème" msgid "Error" msgstr "Erreur" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Tout" @@ -1256,15 +1266,15 @@ msgstr "Catégorie existante" #: templates/web/base/js/translation_strings.html:49 msgid "Expand map" -msgstr "" +msgstr "Agrandir la carte" #: templates/web/base/report/new/form_report.html:54 msgid "Explain what’s wrong" msgstr "Expliquez le problème" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" -msgstr "" +msgstr "Exporter en tant que CSV" #: perllib/FixMyStreet/Cobrand/Zurich.pm:179 #: perllib/FixMyStreet/Cobrand/Zurich.pm:918 @@ -1278,7 +1288,7 @@ msgstr "Externe" msgid "External ID" msgstr "ID externe" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "URL externe" @@ -1290,19 +1300,18 @@ msgstr "Body extérieur" msgid "External team" msgstr "Équipe externe" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 -#, fuzzy msgid "Extra Fields" -msgstr "Précisions supplémentaires" +msgstr "Champs supplémentaires" #: templates/web/base/admin/contact-form.html:141 #: templates/web/base/admin/report_edit.html:94 msgid "Extra data:" msgstr "Donnée supplémentaire:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "Précisions supplémentaires" @@ -1314,7 +1323,7 @@ msgstr "Échec de l'envoi du message" #: templates/web/base/admin/reportextrafields/edit.html:58 #: templates/web/base/admin/reportextrafields/index.html:9 msgid "Fields" -msgstr "" +msgstr "Champs" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1332,21 +1341,22 @@ msgstr "Résoudre ceci en chosissant une zone couverte dans le #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Résolu" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Résolu - Administration" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Résolu - Usager" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Signaler comme supprimé" @@ -1354,7 +1364,7 @@ msgstr "Signaler comme supprimé" msgid "Flag user" msgstr "Signaler l'usager" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Signalé" @@ -1363,7 +1373,7 @@ msgstr "Signalé" msgid "Flagged reports and users" msgstr "Rapports signalés et utilisateurs" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Les utilisateurs signalés sont listés dans la page signalé" @@ -1371,8 +1381,8 @@ msgstr "Les utilisateurs signalés sont listés dans la page signal msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Signalé :" @@ -1386,13 +1396,13 @@ msgstr "Pour de meilleurs résultats veuillez joindre un gros plan et un plan la #: templates/web/base/admin/extra-metadata-form.html:52 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 "" +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 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Pour plus d'information, Lire comment FixMyStreet utilise Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1412,8 +1422,12 @@ msgstr "Souhait transmis à l'administration" msgid "Frequently Asked Questions" msgstr "Foire Aux Questions" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1437,7 +1451,7 @@ msgstr "Donnez-moi un flux RSS" #: templates/web/base/admin/reportextrafields/edit.html:6 msgid "Give this collection of fields a name. It is not shown publicly, just here in the admin." -msgstr "" +msgstr "Donnez à cette collection un nom de champs. Il n'est pas affiché publiquement, juste ici dans l'admin." #: templates/web/base/questionnaire/completed.html:14 msgid "Glad to hear it’s been fixed!" @@ -1446,12 +1460,12 @@ msgstr "Heureux d'entendre qu'il a été résolu!" #: 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Ok" @@ -1459,7 +1473,7 @@ msgstr "Ok" msgid "Going to send questionnaire?" msgstr "Envoi du questionnaire ?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "Accorder l'accès à l'admin" @@ -1467,6 +1481,15 @@ 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/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "par %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Est-ce que le problème a été réglé ?" @@ -1487,68 +1510,70 @@ msgstr "Aide" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "Aide %s résoud votre problème plus rapidement, en fournissant quelques détails supplémentaires. Cette information supplémentaire ne sera pas publié en ligne." +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Photos de rapports récents à proximité" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Bienvenue %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Caché(s)" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" -msgstr "" +msgstr "Masquer tout le rapport" #: templates/web/base/my/anonymize.html:1 #: templates/web/base/my/anonymize.html:2 msgid "Hide my name" -msgstr "" +msgstr "Cacher mon nom" #: templates/web/base/my/anonymize.html:21 msgid "Hide my name everywhere" -msgstr "" +msgstr "Cacher mon nom partout" #: templates/web/base/my/anonymize.html:10 msgid "Hide my name in this update" -msgstr "" +msgstr "Cacher mon nom dans cette mise à jour" #: templates/web/base/my/anonymize.html:16 msgid "Hide my name on this report" -msgstr "" +msgstr "Cacher mon nom sur ce rapport" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Cacher les anciens" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Cacher les épingles" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" -msgstr "" +msgstr "Masquer la mise à jour complètement?" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" -msgstr "" +msgstr "Cacher votre nom?" #: templates/web/base/admin/extra-metadata-form.html:38 msgid "Hint" -msgstr "" +msgstr "Allusion" #: templates/web/base/admin/category_edit.html:24 msgid "History" msgstr "Historique" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Retour" @@ -1595,14 +1620,18 @@ msgstr "Identifier un parent si cet interlocuteur fait lui-mêm #: templates/web/base/auth/token.html:19 msgid "If there's a user associated with the address you entered, we've sent a confirmation email." -msgstr "" +msgstr "S'il y a un utilisateur associé à l'adresse que vous avez saisie, nous avons envoyé un courrier électronique de confirmation." #: templates/web/base/admin/responsepriorities/edit.html:23 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here." -msgstr "" +msgstr "Si cette priorité est transmise à un service externe (par exemple Exor / Confirm), entrez le code de priorité à utiliser avec ce service ici." #: templates/web/base/admin/extra-metadata-form.html:24 msgid "If ticked the user won’t see an input field, just the ‘Description’ text." +msgstr "Si coché, l'utilisateur ne verra pas un champ de saisie, juste le texte 'Description'." + +#: templates/web/base/admin/template_edit.html:59 +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 @@ -1611,6 +1640,10 @@ msgid "" " 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 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." @@ -1619,7 +1652,7 @@ msgstr "Si vous obtenez un peu plus d'informations sur l'état de votre problèm 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." -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Si vous voulez que seulement ce modèle soit une option pour des catégories spécifiques, choisissez-les ici. Par défaut, ils seront visibles pour toutes les catégories." @@ -1628,9 +1661,9 @@ msgstr "Si vous voulez que seulement ce modèle soit une option pour des catégo msgid "If you submit a problem here the problem will not be reported to the council." msgstr "Si vous soumettez un problème ici, le problème ne sera pas signalé a l'administration." -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." -msgstr "" +msgstr "Si vous souhaitez utiliser ce modèle pour prétraiter le champ de mise à jour lorsque vous modifiez l'état d'un rapport, sélectionnez le ici." #: templates/web/base/questionnaire/index.html:70 msgid "" @@ -1699,7 +1732,7 @@ msgstr "En cours" #: templates/web/base/admin/contact-form.html:57 msgid "Inactive" -msgstr "" +msgstr "Inactif" #: templates/web/base/tokens/confirm_alert.html:11 msgid "Inbox zero, here we come!" @@ -1709,23 +1742,19 @@ msgstr "Boîte de réception zéro, nous voilà!" msgid "Include reporter personal details" msgstr "Inclure les détails personnels du reporter" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Inclure les rapports non confirmés" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Valeur has_photo invalide \"%s\"" #: templates/web/base/report/_inspect.html:5 msgid "Inspect report" -msgstr "" +msgstr "Inspecter le rapport" #: templates/web/base/admin/contact-form.html:85 msgid "Inspection required" msgstr "inspection requise" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "Instruire entrepreneurs pour résoudre les problèmes" @@ -1735,28 +1764,20 @@ msgstr "Notes internes" #: templates/web/base/offline/appcache.html:3 msgid "Internet glitch" -msgstr "" +msgstr "Conflit Internet" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Valeur agency_responsible invalide \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Date de fin invalide" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Format spécifié %s invalide" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 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." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Date de début invalide" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "Il est souvent plus rapide de parcourir notre FAQs et d'y chercher la réponse." @@ -1775,7 +1796,7 @@ msgstr "Zone d'administration Inconnue" msgid "Jurisdiction unknown" msgstr "Zone d'administration Inconnue" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1784,30 +1805,25 @@ msgstr "Se souvenir de moi sur cet ordinateur" #: templates/web/base/admin/extra-metadata-form.html:61 msgid "Key" -msgstr "" +msgstr "Clé" #: templates/web/base/admin/states/index.html:9 #: templates/web/base/admin/states/index.html:95 msgid "Label" -msgstr "" +msgstr "Label" #: templates/web/base/admin/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" -msgstr "" +msgstr "La langue" #: templates/web/base/admin/reportextrafields/index.html:8 msgid "Languages" -msgstr "" +msgstr "Langues" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" -msgstr "" +msgstr "Les 7 dernièrs jours" #: templates/web/base/admin/body.html:74 #: templates/web/zurich/admin/body.html:16 @@ -1816,7 +1832,7 @@ msgstr "Dernier auteur" #: templates/web/base/questionnaire/index.html:25 msgid "Last update" -msgstr "" +msgstr "dernières mise à jour" #: templates/web/base/admin/report_edit.html:89 msgid "Last update:" @@ -1829,35 +1845,31 @@ msgstr "Dernière actualisation :" #: templates/web/base/report/_inspect.html:30 #: templates/web/base/report/_item.html:88 msgid "Latitude/Longitude:" -msgstr "" +msgstr "Latitude/Longitude:" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "Moins récemment mis à jour" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" -msgstr "" +msgstr "Liste" #: templates/web/base/admin/body.html:31 msgid "List all reported problems" msgstr "Lister tous les problèmes rapportés" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Chargement…" #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1881,32 +1893,36 @@ msgstr "Localisez le problème sur un plan des alentours" #: templates/web/base/report/new/form_user_loggedout.html:6 #: templates/web/base/report/update/form_user_loggedout.html:7 msgid "Log in with Facebook" -msgstr "" +msgstr "Se connecter avec Facebook" #: templates/web/base/auth/general.html:32 #: templates/web/base/report/new/form_user_loggedout.html:14 #: templates/web/base/report/update/form_user_loggedout.html:15 msgid "Log in with Twitter" -msgstr "" +msgstr "Se connecter avec Twitter" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" -msgstr "" +msgstr "Se connecter par email" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +#, fuzzy +msgid "Log in with email/text" +msgstr "Se connecter par email" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" -msgstr "" +msgstr "Chercher" #: templates/web/base/js/translation_strings.html:44 msgid "MAP" msgstr "CARTE" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "Gérer la liste" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1918,11 +1934,11 @@ msgstr "Carte" msgid "Mark as sent" msgstr "Marqué comme envoyé" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 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:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "Marquer les détails du problème" @@ -1942,45 +1958,45 @@ msgstr "Message à l'organisme externe compétent:" msgid "Missing bodies:" msgstr "Organismes disparus :" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "jurisdiction_id manquant" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "Modérer" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "Modérer les détails du rapport" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "Modérer ce rapport" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" -msgstr "" +msgstr "Modifiez cette mise à jour" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" -msgstr "" +msgstr "Modifiez par %s à %s" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Modéré par division dans le délai d'un jour ouvrable" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" -msgstr "" +msgstr "Raison de la modification:" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Mois" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "Les plus commentés" @@ -1998,9 +2014,9 @@ msgstr "Les plus commentés" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2011,19 +2027,24 @@ msgstr "Nom" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Nom :" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Nom: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "Accédez à ce problème" +#: templates/web/base/report/_inspect.html:39 +#, fuzzy +msgid "Nearest calculated address:" +msgstr "Nouvelle adresse émail :" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2033,12 +2054,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2048,26 +2069,30 @@ msgstr "" #: templates/web/base/auth/token.html:18 msgid "Nearly done!" -msgstr "" +msgstr "Presque fini!" #: templates/web/base/auth/token.html:22 templates/web/base/email_sent.html:5 msgid "Nearly done! Now check your email…" msgstr "Presque fini! Maintenant, veuillez vérifier votre email" -#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 +#: templates/web/base/auth/smsform.html:19 #, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "Presque fini! Maintenant, veuillez vérifier votre email" + +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" -msgstr "Plus récents" +msgstr "Nouveau" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Nouveau body ajouté" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Nouveau contact de catégorie rajouté" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "Nouvelle adresse émail :" @@ -2088,6 +2113,11 @@ msgstr "Nouvelle note à DM:" msgid "New password:" msgstr "Nouveau mot de passe :" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Sans numéro de téléphone)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2117,18 +2147,19 @@ msgstr "Nouveaux problèmes dans les limites de {{NAME}} sur FixMyStreet.fr" msgid "New reports" msgstr "Nouveaux rapports" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Nouvel état" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Nouveau modèle" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "Plus récents" @@ -2136,7 +2167,7 @@ msgstr "Plus récents" msgid "Next" msgstr "Suivant" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2148,22 +2179,18 @@ msgstr "Suivant" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Non" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Aucune zone" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Aucun intelocuteur" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Pas d'administration" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Aucune administration sélectionnée" @@ -2187,10 +2214,14 @@ msgstr "Pas d'autres mises à jour" #: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:68 msgid "No inspections by that inspector in the selected date range." -msgstr "" +msgstr "Aucune inspection effectuée par cet inspecteur dans la fourchette de dates sélectionnée." #: perllib/FixMyStreet/App/Controller/Admin/ExorDefects.pm:70 msgid "No inspections in the selected date range." +msgstr "Aucune inspection dans la plage de dates sélectionnée." + +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" msgstr "" #: templates/web/base/js/translation_strings.html:37 @@ -2217,8 +2248,8 @@ msgstr "Aucun supporter" msgid "None" msgstr "Aucun" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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." @@ -2226,8 +2257,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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2250,7 +2281,7 @@ msgstr "injoignable" msgid "Not for my subdivision" msgstr "Pas pour ma subdivision" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Jamais signalé" @@ -2264,10 +2295,6 @@ msgstr "Non signalé à l'administration" msgid "Note" msgstr "Note" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Notez que quand les rapports non confirmés sont inclus nous utilisons la date de création du rapport, qui peut être dans un autre mois que la date de confirmation, ce qui peut légèrement faire varier les chiffres." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2283,7 +2310,7 @@ msgstr "Notes du SDM pour DM" #: templates/web/base/admin/extra-metadata-form.html:26 msgid "Notice" -msgstr "" +msgstr "Notification" #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" @@ -2295,37 +2322,47 @@ msgstr "Maintenant pour envoyer votre rapport…" msgid "Now to submit your update…" msgstr "Maintenant pour envoyer votre mise à jour…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." -msgstr "" +msgstr "Nombre de problèmes signalés dans chaque catégorie, au cours des 7 derniers jours." + +#: templates/web/base/reports/index.html:99 +#, fuzzy +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "Nombre de problèmes signalés dans chaque catégorie, au cours des 7 derniers jours." #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" -msgstr "" +msgstr "Données hors ligne effacées" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" -msgstr "" +msgstr "Données de mise à jour hors ligne enregistrées" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Ancien état" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "Plus anciens" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2353,37 +2390,43 @@ msgid "Open311 specification" msgstr "Spécification Open311" #: templates/web/base/admin/extra-metadata-form.html:53 -#, fuzzy msgid "Options" -msgstr "optionnel" +msgstr "Options" #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" -msgstr "" +msgstr "Ou abonnez-vous par RSS" #: templates/web/base/admin/extra-metadata-form.html:8 msgid "Order" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +msgstr "Commander" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Autres" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" -msgstr "" +msgstr "Autres catégories" + +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "autres lieux:" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:120 msgid "Overall average" -msgstr "" +msgstr "Moyenne générale" #: templates/web/base/admin/list_updates.html:8 msgid "Owner" @@ -2399,19 +2442,19 @@ msgstr "Page Introuvable" msgid "Parent" msgstr "Parent" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Partiel" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Mot de passe (facultatif)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Mot de passe :" @@ -2419,28 +2462,33 @@ msgstr "Mot de passe :" msgid "Permalink" msgstr "Lien permanent" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "Autorisations :" #: templates/web/base/report/_inspect.html:19 -#, fuzzy msgid "Phone Reporter:" -msgstr "Remis:" +msgstr "Téléphone Reporter:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Numéro de téléphone" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Téléphone (facultatif)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Téléphone Reporter:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Téléphone" @@ -2456,7 +2504,7 @@ msgstr "Téléphone" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2482,12 +2530,18 @@ msgstr "Photos" msgid "Photos of recent nearby reports" msgstr "Photos de rapports récents à proximité" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" -msgstr "" +msgstr "Choisissez votre administration" + +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +#, fuzzy +msgid "Pick your ward" +msgstr "Choisissez votre administration" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Placer l'épingle sur la carte" @@ -2509,25 +2563,34 @@ msgstr "Merci d'être poli, concis et précis." msgid "Please check the passwords and try again" msgstr "Merci de vérifier les mots de passe et de réessayer" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Merci de vérifier que votre adresse email est correcte" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Merci de sélectionner une catégorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Merci de corriger les erreurs ci-dessous" @@ -2545,39 +2608,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Merci d'entrer un message" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Saisissez votre numéro de téléphone" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "Merci d'entrer un nom" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 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:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Merci d'entrer un mot de passe :" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Merci d'enter un sujet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Merci d'entrer un email valide" @@ -2586,55 +2657,62 @@ msgstr "Merci d'entrer un email valide" msgid "Please enter a valid email address" msgstr "Merci d'entrer une adresse email valide" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Saisissez votre numéro de téléphone" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Merci d'entrer quelques détails" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Merci d'entrer votre email" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Merci d'entrer votre adresse email" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Saisissez votre prénom" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Merci de saisir votre nom" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Saisissez votre numéro de téléphone" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Saisissez votre nom de famille" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Saisissez votre profession" @@ -2683,7 +2761,12 @@ 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:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Veuillez fournir une mise à jour publique de ce rapport." + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "Veuillez fournir une mise à jour publique de ce rapport." @@ -2723,6 +2806,11 @@ msgstr "Merci de préciser si le problème a été réglé ou non." msgid "Please upload an image only" msgstr "Veuillez uniquement envoyer une image" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Merci de saisir un message" @@ -2732,7 +2820,7 @@ msgid "Please write your update here" msgstr "Merci d'écrire votre mise à jour ici" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Envoyer" @@ -2741,15 +2829,15 @@ msgstr "Envoyer" msgid "Posted anonymously at %s" msgstr "Signalé anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Signalé par %s à %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Envoyé par %s (%s) à %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Envoyé par %s à %s" @@ -2761,11 +2849,11 @@ msgstr "Powered by F msgid "Previous" msgstr "Précédent" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "Priorités" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "Priorité" @@ -2782,13 +2870,13 @@ 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/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privé" #: templates/web/base/report/new/form_user.html:1 msgid "Private details" -msgstr "" +msgstr "détails privés" #: templates/web/base/maps/pin.html:13 msgid "Problem" @@ -2806,29 +2894,28 @@ msgstr "Problème %d confirmé" msgid "Problem %s sent to council %s" msgstr "Problème %d signalé à l’administration %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Répartition des problèmes par état" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problème signalé comme ouvert." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 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:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problèmes" #: templates/web/base/alert/_list.html:22 -#, fuzzy msgid "Problems in an area" -msgstr "Problèmes dans la localité %s" +msgstr "Problèmes dans une zone" #: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" @@ -2843,11 +2930,10 @@ msgid "Problems recently reported fixed on FixMyStreet" msgstr "Problèmes récemment signalés sur FixMyStreet.fr" #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "Problems within %.1fkm of %s" -msgstr "Problèmes à moins de %.1fkm de ce lieu" +msgstr "Problèmes entre %.1fkm de %s " -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2859,9 +2945,8 @@ msgid "Problems within %s ward" msgstr "Problèmes dans la localité %s" #: perllib/FixMyStreet/Cobrand/UK.pm:263 perllib/FixMyStreet/Cobrand/UK.pm:275 -#, fuzzy msgid "Problems within %s ward, %s" -msgstr "Problèmes dans la localité %s" +msgstr "Problèmes entre%squartier,%s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 @@ -2873,7 +2958,8 @@ msgstr "Problèmes dans %s, %s" msgid "Property address:" msgstr "Adresse de propriété:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Apporter une mise à jour" @@ -2882,30 +2968,30 @@ msgstr "Apporter une mise à jour" msgid "Provide update as" msgstr "Fournir la mise à jour comme" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Fournir un nom et un mot de passe est optionnel, mais cela vous permettra de soumettre des problèmes, faire des mises à jour et gérer les rapports plus facilement." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Un mot de passe n'est pas obligatoire, mais vous permettra de créer, mettre à jour et administrer vos rapports plus facilement." #: templates/web/base/report/new/form_report.html:10 msgid "Public details" -msgstr "" +msgstr "Détails public" #: templates/web/zurich/admin/report_edit.html:241 #: templates/web/zurich/admin/report_edit.html:268 msgid "Public response:" msgstr "Réponse publique:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "Mise à jour publique :" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Publier une photo" @@ -2960,7 +3046,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2985,7 +3071,7 @@ msgstr "Flux RSS des mises à jour pour ce problème" msgid "Receive email when updates are left on this problem." msgstr "Etre informé par courriel lorsque ce problème est mis à jour." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "Reçu par %s un peu plus tard" @@ -2999,7 +3085,7 @@ 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:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "Récemment mis à jour" @@ -3008,14 +3094,12 @@ msgid "Remember that FixMyStreet is primarily for reporting physical problems th msgstr "Rappelez-vous que FixMyStreet est principalement destiné au signalement de problèmes physiques qui peuvent être résolus. Si votre problème ne convient pas pour être soumis via ce site, n'oubliez pas que vous pouvez contacter votre administration directement à l'aide de leur propre site web." #: templates/web/base/admin/extra-metadata-form.html:68 -#, fuzzy msgid "Remove" -msgstr "Effacer le signalement" +msgstr "Retirer" #: templates/web/base/admin/extra-metadata-form.html:4 -#, fuzzy msgid "Remove field" -msgstr "Effacer le signalement" +msgstr "Retirer le champ" #: templates/web/base/admin/report_blocks.html:23 msgid "Remove flag" @@ -3023,9 +3107,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:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "Supprimer de votre liste" @@ -3033,12 +3117,16 @@ msgstr "Supprimer de votre liste" msgid "Remove from site" msgstr "Retirer du site" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Effacer la photo (ne peut pas être annulé !)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "Répondre à l'utilisateur:" @@ -3067,13 +3155,13 @@ msgstr "Signaler un abus" msgid "Report as" msgstr "Signaler comme" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Signaler sur %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" -msgstr "" +msgstr "État du rapport:" #: templates/web/base/report/new/fill_in_details_form.html:1 #: templates/web/base/report/new/login_success_form.html:1 @@ -3086,17 +3174,17 @@ msgstr "Signaler votre problème" msgid "Report, view, or discuss local problems" msgstr "Signalez et suivez les problèmes locaux" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Signalé anonymement à %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Signalé avant" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Signalé par %s à %s" @@ -3110,27 +3198,27 @@ msgstr "Rapporté par:" msgid "Reported in the %s category" msgstr "Rapporté dans la catégorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Signalé dans la catégorie %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Signalé dans la catégorie %s par %s à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Signalé par %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Signalé par %s par %s à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Signalé par %s dans la catégorie %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Signalé par %s dans la catégorie %s par %s" @@ -3139,8 +3227,8 @@ msgstr "Signalé par %s dans la catégorie %s par %s" msgid "Reported:" msgstr "Remis:" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3148,10 +3236,9 @@ msgstr "Remis:" msgid "Reporting a problem" msgstr "Signalisation d'un problème" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Rapports" @@ -3164,35 +3251,32 @@ msgid "Reports awaiting approval" msgstr "Rapports attendant une validation" #: templates/web/base/alert/_list.html:54 -#, fuzzy msgid "Reports by destination" -msgstr "Signalé par %s à %s" +msgstr "Rapports par destination" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 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." #: templates/web/base/alert/_list.html:15 msgid "Reports near %s are sent to different councils, depending on the type of problem." -msgstr "" +msgstr "Selon le type de problème, les rapports à proximité sont envoyés à différentes administrations, " #: templates/web/zurich/admin/index-sdm.html:10 msgid "Reports published" msgstr "Rapports publiés" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." -msgstr "" +msgstr "Rapports enregistrés hors ligne." #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 -#, fuzzy msgid "Reports sent to %s" -msgstr "Signaler sur %s" +msgstr "Rapports envoyés à %s" #: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 -#, fuzzy msgid "Reports sent to %s, within %s ward" -msgstr "Flux RSS de %s, dans la localité %s" +msgstr "Rapports envoyés à %s, entre %s quartier" #: templates/web/base/admin/index.html:56 msgid "Reports waiting to be sent" @@ -3207,9 +3291,8 @@ msgid "Reputation threshold" msgstr "Seuil de réputation" #: templates/web/base/admin/extra-metadata-form.html:20 -#, fuzzy msgid "Required" -msgstr "obligatoire" +msgstr "Obligatoire" #: templates/web/base/admin/report_edit.html:84 msgid "Resend report" @@ -3236,23 +3319,24 @@ msgid "Response Templates" msgstr "Modèles de réponse" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "Modèles de réponse pour %s" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" -msgstr "" +msgstr "Revenir à l'original" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" -msgstr "" +msgstr "Revenir au texte original" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" -msgstr "" +msgstr "Revenir au titre original" #: templates/web/base/js/translation_strings.html:28 #: templates/web/base/js/translation_strings.html:40 @@ -3269,17 +3353,17 @@ 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:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Pivoter à gauche" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Pivoter à droite" @@ -3289,21 +3373,21 @@ 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:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satellite" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" -msgstr "" +msgstr "Enregistrer + fermer en double" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3312,21 +3396,20 @@ msgstr "Enregistrer les modifications" #: templates/web/base/admin/reportextrafields/edit.html:64 msgid "Save new fields" -msgstr "" +msgstr "Sauvegarder de nouveaux champs" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" -msgstr "" +msgstr "Enregistrement des rapports hors ligne" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:132 -#, fuzzy msgid "Scheduled" -msgstr "Action programmée" +msgstr "Planifié" #: templates/web/base/admin/index.html:26 #: templates/web/base/admin/reports.html:1 @@ -3338,7 +3421,7 @@ msgstr "Rechercher rapports" msgid "Search Users" msgstr "Rechercher les utilisateurs" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Rechercher les rapports" @@ -3349,6 +3432,7 @@ msgid "Search:" msgstr "Rechercher :" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Aucun rapport trouvé lors de la recherche." @@ -3361,23 +3445,23 @@ msgstr "Aucun utilisateur trouvé lors de la recherche." msgid "See our privacy policy" msgstr "Voir notre politique de confidentialité" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" -msgstr "" +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 msgid "Select a body" msgstr "Sélectionnez un interlocuteur" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Sélectionnez une zone" #: templates/web/base/admin/responsepriorities/edit.html:33 msgid "Select if this is the default priority" -msgstr "" +msgstr "Sélectionnez si c'est la priorité par défaut" #: templates/web/base/admin/category-checkboxes.html:6 msgid "Select:" @@ -3385,17 +3469,22 @@ msgstr "Sélectionner :" #: templates/web/base/contact/index.html:107 msgid "Send" -msgstr "" +msgstr "Envoyé" #: templates/web/base/admin/open311-form-fields.html:109 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/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "Envoyé le rapport en retour" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Envoyé à %s %s plus tard)" @@ -3404,11 +3493,11 @@ msgid "Sent:" msgstr "Envoyé :" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Service:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "Situé à mon emplacement actuel" @@ -3417,70 +3506,67 @@ msgid "Share" msgstr "Partagez" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "Liste" #: templates/web/base/reports/body.html:32 msgid "Shortlist all visible" -msgstr "" +msgstr "Liste abrégée visible" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "Shortlisté" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "Shortlisté par %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" -msgstr "" +msgstr "Afficher la photo ?" #: templates/web/base/questionnaire/index.html:26 msgid "Show all updates" -msgstr "" +msgstr "Afficher toutes les mises à jour" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Afficher mon nom publiquement" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" -msgstr "" - -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Montrer les anciens" +msgstr "Afficher le nom publiquement ?" -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" -msgstr "" +msgstr "Afficher la photo" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Montrer les épingles" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" -msgstr "" +msgstr "Afficher le nom du déclarant" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" -msgstr "" +msgstr "Afficher les rapports dans votre région" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3491,12 +3577,17 @@ msgstr "S'authentifier" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Connectez-vous par e-mail à la place en fournissant un nouveau mot de passe. Lorsque vous cliquez sur le lien dans votre e-mail, votre mot de passe sera mis à jour." +#: templates/web/base/auth/general.html:96 +#, fuzzy +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "Connectez-vous par e-mail à la place en fournissant un nouveau mot de passe. Lorsque vous cliquez sur le lien dans votre e-mail, votre mot de passe sera mis à jour." + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Connectez-vous ou créez un compte" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Déconnexion" @@ -3514,7 +3605,7 @@ msgstr "" "Certains destinataires nécessitent une clé API pour indiquer que les rapports \n" "sont envoyés depuis votre application FixMyStreet." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Photos de rapports récents" @@ -3527,15 +3618,20 @@ msgstr "Du texte pour localiser" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "Désolé, cela n'est pas un lien valide" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "Désolé, cela n'est pas un lien valide" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3563,25 +3659,28 @@ 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." msgstr "" +"Désolé, nous n'avons pas une connexion assez bonne pour récupérer cette page ou\n" +"la page n'a pas été trouvée ou il y a eu une erreur de serveur. Veuillez réessayer plus tard." #: perllib/FixMyStreet/App/Controller/Root.pm:124 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:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "Trier par" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 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:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "Personnel :" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Date de début:" #: templates/web/base/admin/body.html:73 @@ -3591,18 +3690,20 @@ msgstr "Date de début:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "État actuel" -#: templates/web/base/report/update.html:48 -#, fuzzy +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 msgid "State changed to:" -msgstr "Enregistrer les modifications" +msgstr "L'état a changé pour:" #: templates/web/base/admin/report_edit.html:116 #: templates/web/base/admin/update_edit.html:28 @@ -3613,17 +3714,18 @@ msgstr "Enregistrer les modifications" msgid "State:" msgstr "État actuel :" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 -#, fuzzy msgid "States" -msgstr "État actuel" +msgstr "État" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistiques" @@ -3633,7 +3735,7 @@ msgstr "Statistiques" msgid "Status" msgstr "Statut" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Encore ouvert, via le questionnaire, %s" @@ -3644,9 +3746,14 @@ msgstr "Street View" #: templates/web/base/admin/extra-metadata-form.html:46 msgid "String" -msgstr "" +msgstr "Chaîne" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Sous-catégorie: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Sous-catégorie: %s" @@ -3663,18 +3770,19 @@ msgstr "Sujet" msgid "Subject:" msgstr "Sujet :" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Envoyer" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3704,9 +3812,8 @@ msgid "Subscribe" msgstr "S'abonner" #: templates/web/base/alert/_list.html:72 -#, fuzzy msgid "Subscribe by email" -msgstr "Abonnez moi à une alerte par email" +msgstr "S'abonner par email" #: templates/web/base/report/new/form_report.html:19 msgid "Summarise the problem" @@ -3716,7 +3823,7 @@ msgstr "Résumer le problème" msgid "Summarise your changes" msgstr "Résumez vos modifications" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3724,25 +3831,31 @@ msgstr "Résumez vos modifications" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Résumé" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Rapports résumés" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Rapports résumés" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "Superuser :" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 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." -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Résultats de l'enquête" @@ -3750,14 +3863,14 @@ msgstr "Résultats de l'enquête" msgid "Template «%s»" msgstr "Modèle «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Modèles" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Texte" @@ -3765,7 +3878,7 @@ msgstr "Texte" msgid "Text only version" msgstr "Version texte seulement" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3792,7 +3905,7 @@ msgstr "Merci pour votre enquête" msgid "Thank you for your feedback" msgstr "Merci pour vos commentaires" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Merci d'avoir chargé votre photo. Nous avons besoin maintenant de localiser le problème, saisissez l'adresse et le code postal dans le champ ci-dessus :" @@ -3808,7 +3921,7 @@ msgstr "Cette image ne ​​semble pas avoir été chargée correctement (% s), 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Ce lieu ne semble pas ce trouver au Royaume-Uni; Merci de le saisir à nouveau." @@ -3818,11 +3931,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Ce problème a été marqué comme envoyé." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Ce problème va maintenant être renvoyé." @@ -3860,8 +3973,8 @@ 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3886,7 +3999,7 @@ msgstr "" #: templates/web/base/admin/extra-metadata-form.html:12 msgid "The code used to store this field value in the database. e.g. address would be available as problem.extra.address in the templates." -msgstr "" +msgstr "Le code utilisé pour stocker cette valeur de champ dans la base de données. par exemple. address serait disponible sous la forme problem.extra.address dans les modèles." #: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 @@ -3898,14 +4011,14 @@ msgstr "L'administration ne pourra intervenir que si vous laissez autant de dét 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:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "L'erreur était : %s" #: templates/web/base/admin/extra-metadata-form.html:30 msgid "The field name as shown to the user on the report form." -msgstr "" +msgstr "Le nom du champ tel qu’indiqué á l’utilisateur sur le formulaire de rapport." #: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." @@ -3941,7 +4054,7 @@ msgstr "Les derniers problèmes locaux signalés comme résolus par les utilisat msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Les derniers problèmes à l'intérieur de {{NAME}} rapportés par les utilisateurs" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 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." @@ -3951,7 +4064,7 @@ msgstr "La liste des zones disponibles est donnée par le service Mapit de %s. " #: templates/web/base/admin/extra-metadata-form.html:6 msgid "The ordering of this field on the report page. Fields are shown in ascending order according to this value." -msgstr "" +msgstr "L’ordre de ce champ sur la page de rapport. Les champs sont affichés en ordre croissant selon cette valeur." #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:26 @@ -3964,9 +4077,9 @@ msgstr "L'URL demandée « %s » n'a pas été trouvée sur ce serveur" #: templates/web/base/admin/extra-metadata-form.html:42 msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." -msgstr "" +msgstr "Le type de champ de saisie à afficher à l'utilisateur.Text est un champ de texte simple, Liste est une sélection déroulante." -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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é" @@ -3979,33 +4092,38 @@ msgstr "" "Le nom des utilisateurs est affiché publiquement sur les rapports qui n'ont pas été signalés comme anonymes.\n" "Les noms sont nécessairement uniques." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Il n'y a pas de rapports à montrer." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Il y a un problème avec votre combinaison email / mot de passe. Si vous ne pouvez pas vous souvenir de votre mot de passe, ou n'en avez pas, remplissez s'il vous plaît la section « s'authentifier par email » du formulaire." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Il y a un problème avec votre combinaison email / mot de passe. Réessayez s'il vous plaît." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Il y a un problème avec votre combinaison email / mot de passe. Si vous ne pouvez pas vous souvenir de votre mot de passe, ou n'en avez pas, remplissez s'il vous plaît la section « s'authentifier par email » du formulaire." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 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." @@ -4013,7 +4131,7 @@ msgstr "Il y a un problème avec votre mise à jour. Réessayez s'il vous plaît 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." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Il y a un problème avec votre mise à jour. Voir s'il vous plaît plus bas." @@ -4076,26 +4194,34 @@ 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:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ces renseignements sont nécessaires" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Ceci est un site en développement, le service peut être interrompu à tout moment, et la base de données sera régulièrement effacée." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "Ce nid de poule est ici depuis deux mois et ..." @@ -4110,11 +4236,11 @@ msgstr "Ce problème n'a pas été résolu" #: templates/web/base/report/update/form_update.html:46 msgid "This problem is still ongoing" -msgstr "" +msgstr "Ce problème est toujours en cours" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" -msgstr "" +msgstr "Ce rapport est un dupliqua. Veuillez mettre è jour le rapport original:" #: perllib/FixMyStreet/Cobrand/Zurich.pm:166 #: perllib/FixMyStreet/Cobrand/Zurich.pm:167 @@ -4122,23 +4248,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Ce rapport attend une modération." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Ce rapport est actuellement marqué comme fermé." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Ce rapport est actuellement marqué comme résolu." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Ce rapport est actuellement marqué comme ouvert." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Ce rapport a été soumis anonymement" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4149,7 +4275,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Chronologie" @@ -4161,93 +4287,87 @@ msgstr "Conseils pour des photos adaptées" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Titre" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Titre:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "Pour savoir quelles sont les alertes locales pour vous, s'il vous plaît entrez le code postal de votre %s, le nom de la rue et de la commune:" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Pour afficher les alertes qui vous concernent, saisissez votre code postal ou le nom d'une rue et une localité" #: templates/web/base/admin/reportextrafields/edit.html:19 msgid "To limit this collection of fields to a single cobrand, select it here." -msgstr "" +msgstr "Pour limiter cette collection de champs à un seul cobrand, sélectionnez-la ici." #: templates/web/base/admin/reportextrafields/edit.html:40 msgid "To limit this collection of fields to a single language, select it here." -msgstr "" +msgstr "Pour limiter cette collection de champs à une seule langue, sélectionnez-la ici." -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 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" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" +msgstr "Top 5 des catégories les plus utilisées" + +#: templates/web/base/reports/index.html:111 msgid "Top 5 responsive councils" +msgstr "Top 5 des administrations les plus réactives" + +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 msgid "Total" msgstr "Total" -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" -msgstr "" - -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" - -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "La gestion du trafic est nécessaire ?" #: templates/web/base/admin/_translations.html:7 msgid "Translation" -msgstr "" +msgstr "Traduction" #: templates/web/base/admin/_translations.html:2 msgid "Translations" -msgstr "" +msgstr "Traductions" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "Accrédité par les organismes:" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 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:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "Accrédité :" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Essayez à nouveau" @@ -4260,9 +4380,13 @@ msgstr "Essayez en nous envoyant un e-mail directement:" #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 msgid "Type" +msgstr "Type" + +#: templates/web/base/admin/user-form.html:38 +msgid "Unban" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: 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 @@ -4271,15 +4395,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Non confirmé" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "rapports non résolus" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Inconnu" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Type d'alerte inconnu" @@ -4289,19 +4409,20 @@ msgstr "Type d'alerte inconnu" msgid "Unknown error" msgstr "erreur inconnue" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "ID de problème inconnu" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" #: templates/web/base/report/_item.html:26 msgid "Up one" -msgstr "" +msgstr "Remonter d'un" #: templates/web/base/admin/states/index.html:76 #: templates/web/base/report/update/form_update.html:29 @@ -4320,12 +4441,12 @@ msgstr "Mise à jour ci-dessous ajoutée anonymement à %s" 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Interlocuteur pour la mise à jour " -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Répartition des problèmes par état" @@ -4333,16 +4454,16 @@ msgstr "Répartition des problèmes par état" msgid "Update by {{name}}" msgstr "Mise à jour par {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Mise à jour du statut du problème vers %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Une mise à jour a marqué ce problème comme résolu" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Mettre a jour le problème réouvert" @@ -4356,20 +4477,18 @@ msgstr "Mettre à jour les statuts" msgid "Updated" msgstr "Mis à jour" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 -#, fuzzy +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 msgid "Updated by %s (%s) at %s" -msgstr "Envoyé par %s (%s) à %s" +msgstr "Mis à par %s (%s) à %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 -#, fuzzy +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "Updated by %s at %s" -msgstr "Envoyé par %s à %s" +msgstr "Mis à par %s à %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4377,7 +4496,7 @@ msgid "Updated!" msgstr "Mis à jour !" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Mises à jour" @@ -4406,6 +4525,12 @@ msgid "" "map filters, and deleted will remove the category from there\n" "as well." msgstr "" +"L'utilisation confirmed est pour indiquer que ce contact a été\n" +"confirmé comme valide. Si vous n'êtes pas sûr de l'origine ou de la validité du\n" +"contact, utiliser unconfirmed. inactive\n" +"supprimera la catégorie de l'utilisation lors de la déclaration de problèmes, mais la\n" +"conserve dans les filtres de la carte, et deleted supprime la \n" +"catégorie." #: templates/web/base/admin/open311-form-fields.html:65 msgid "Use Open311 update-sending extension" @@ -4424,40 +4549,81 @@ msgstr "Carte utilisée" msgid "User ID to attribute fetched comments to" msgstr "ID utilisateur de récupération des commentaires à" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Email rajouté à la liste des abus" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Email déjà présent dans la liste des abus" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Utilisateur dé–signalé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Utilisateur signalé" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "En table d'abus ?" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "La recherche utilisateurs parcourt les noms et adresses courriel." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Utilisateurs" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Utilisateurs" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 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:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Valeurs mises à jour" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Nouvelle adresse émail :" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Votre numéro de téléphone" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4479,14 +4645,9 @@ msgstr "Consultation d'un lieu" msgid "Viewing a problem" msgstr "Consultation d'un problème" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" -msgstr "" +msgstr "Quartier:" #: templates/web/base/reports/body.html:16 msgid "Wards of this council" @@ -4494,20 +4655,25 @@ msgstr "Localités de cette administration" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Nous avons trouvé plus d'une correspondance pour cet endroit. Nous montrons jusqu'à dix résultats, essayez s'il vous plaît une recherche différente si le vôtre n'est pas ici." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Nous avons trouvé plus d'une correspondance pour cette référence de problème :" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "Nous avons trouvé plus d'une correspondance pour cette référence de problème :" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 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:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4515,6 +4681,12 @@ msgstr "Nous sommes conscients que ce problème pourrait être la responsabilit msgid "We send it to the council on your behalf" msgstr "Nous l'envoyons à l'administration en votre nom" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Nous avons trouvé plus d'une correspondance pour cet endroit. Nous montrons jusqu'à dix résultats, essayez s'il vous plaît une recherche différente si le vôtre n'est pas ici." + #: 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." @@ -4524,8 +4696,8 @@ msgstr "Nous utiliserons vos informations personnelles en accord avec notre MaPit." msgstr "Avec les recherches à requètes, il est également possible de rechercher des agency_responsible pour limiter les demandes à celles qui sont envoyées à une administration unique. Le terme de recherche est l'ID de l'administration fourni par MapIt." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "Aimeriez-vous contribuer à FixMyStreet? Notre code est open source et disponible sur fixmystreet.org " @@ -4592,16 +4768,7 @@ msgstr "Si vous rédigez votre message entièrement en capitales, ou sans ponctu msgid "Wrong location? Just click again on the map." msgstr "Mauvais emplacement? Il suffit de cliquer à nouveau sur la carte." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Année" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4616,7 +4783,7 @@ msgstr "Année" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Oui" @@ -4629,9 +4796,9 @@ msgstr "Oui j'ai un mot de passe" 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:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" -msgstr "" +msgstr "vous êtes hors ligne" #: templates/web/base/contact/unsuitable-text.html:2 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" @@ -4646,13 +4813,13 @@ msgstr "Vous signalez la mise à jour suivante comme étant violente, contenant 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:96 +#: templates/web/base/admin/user-form.html:114 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." #: templates/web/base/alert/_list.html:18 msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." -msgstr "" +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:115 msgid "You can contact technical support on %s" @@ -4675,7 +4842,7 @@ 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:93 +#: templates/web/base/admin/body-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." @@ -4683,9 +4850,9 @@ msgstr "Vous pouvez marqué un interlocuteur comme supprimé si vous ne voulez p 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:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." -msgstr "" +msgstr "vous avez %s sauvegradé à publié." #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "You have already answered this questionnaire. If you have a question, please get in touch, or view your problem.\n" @@ -4710,18 +4877,38 @@ msgstr "Vous avez été déconnecté" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Vous avez localisé le problème au point marqué avec une épingle verte sur la carte. Si ce n'est pas le bon endroit, il suffit de cliquer à nouveau sur la carte." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Votre adresse courriel a bien été confirmée." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Votre adresse courriel a bien été confirmée." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Votre adresse courriel a bien été confirmée." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Votre adresse courriel a bien été confirmée." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Vous avez réussi à vous connecter ; veuillez vérifier et confirmer que vos coordonnées sont exactes :" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Votre adresse courriel a bien été confirmée." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Vous n'avez encore créés aucun rapport. Rapportez un problème maintenant." @@ -4745,36 +4932,43 @@ msgid "Your Reports" msgstr "Vos rapports" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "Votre compte" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Votre email" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Votre adresse email" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Votre adresse email" + #: 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é" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4783,21 +4977,21 @@ msgstr "Votre nom" #: templates/web/base/my/anonymize.html:13 msgid "Your name has already been sent to %s, but we can hide it on this page:" -msgstr "" +msgstr "Votre nom a déjà été envoyé, mais nous pouvons le cacher sur cette page:" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." -msgstr "" +msgstr "Votre nom a été caché de tous vos rapports et mises à jour." -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." -msgstr "" +msgstr "Votre nom a été caché." -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" -msgstr "" +msgstr "Vos rapports hors ligne" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4808,8 +5002,8 @@ msgstr "Votre mot de passe" msgid "Your password has been changed" msgstr "Votre mot de passe a été changé" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Votre numéro de téléphone" @@ -4818,7 +5012,7 @@ msgstr "Votre numéro de téléphone" msgid "Your report" msgstr "Votre rapport" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Vos rapports" @@ -4827,28 +5021,43 @@ msgstr "Vos rapports" msgid "Your shortlist" msgstr "Votre liste" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Votre nom a été caché." + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." -msgstr "" +msgstr "Votre mise à jour a été sauvegardée en mode hors connexion pour la soumission en ligne." -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Vos mises à jour" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "Vous" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "Tous" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 -msgid "and a defect raised" +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" msgstr "" +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 +msgid "and a defect raised" +msgstr "et un défaut soulevé" + #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "par %s" @@ -4862,8 +5071,8 @@ msgstr "administration" msgid "didn't use map" msgstr "n'a pas utilisé le plan" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "Par exemple '%s' ou '%s'" @@ -4886,23 +5095,23 @@ msgstr "dernière mise à jour %s" msgid "less than a minute" msgstr "moins d'une minute" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "s.o." #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "aucun" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" -msgstr "marqué comme n'étant pas de la responsabilité de la commune" +msgstr "pas la responsabilité de l'administration" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "Clickez ici pour vous localiser automatiquement" @@ -4939,11 +5148,10 @@ msgid "there is no pin shown as the user did not use the map" msgstr "Il n'y a aucune épingle affichée parce que l'utilisateur n'a pas utilisé la carte" #: templates/web/base/alert/_list.html:1 -#, fuzzy msgid "this location" -msgstr "Consultation d'un lieu" +msgstr "ce lieu" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "Ce type de problème local" @@ -4951,26 +5159,36 @@ msgstr "Ce type de problème local" msgid "today" msgstr "aujourd'hui" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" -msgstr "" +msgstr "mettre à jour" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" -msgstr "" +msgstr "mises à jour" #: templates/web/base/admin/report_edit.html:52 msgid "used map" msgstr "plan utilisé" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "l'utilisateur est de la même administration que le problème - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "L'utilisateur est propriétaire du problème" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Email déjà présent dans la liste des abus" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Supprimer de votre liste" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4980,8 +5198,8 @@ msgstr "localité" #, perl-format msgid "%d address" msgid_plural "%d addresses" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d adresses" +msgstr[1] "%d adresses" #: perllib/Utils.pm:250 #, perl-format @@ -5008,8 +5226,8 @@ msgstr[1] "%d minutes" #, perl-format msgid "%d month" msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d mois" +msgstr[1] "%d mois" #: templates/web/base/report/_support.html:6 #, perl-format @@ -5029,43 +5247,43 @@ msgstr[1] "%d semaines" #, perl-format msgid "%d year" msgid_plural "%d years" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d année " +msgstr[1] "%d année" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s jours" +msgstr[1] "%s jours" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%sproblème marqué comme corrigé " +msgstr[1] "%s problèmes marqués comme corrigés " -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s problème signalé " +msgstr[1] "%s problèmes signalés" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s rapports" +msgstr[1] "%s rapports" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%s mises à jour des problème" +msgstr[1] "%s mises à jour des problème" #: templates/web/base/front/stats.html:19 #, perl-format @@ -5099,8 +5317,8 @@ msgstr[1] "%s mises à jour de rapports" #, perl-format msgid "Reported %d day ago" msgid_plural "Reported %d days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Signalé %d depuis jours" +msgstr[1] "Signalé depuis %d jours" #: templates/web/base/report/new/top_message_some.html:3 #, perl-format @@ -5120,121 +5338,109 @@ msgstr[1] "Nous n'avons pas encore de détails pour les administrations responsa #, perl-format msgid "last updated %d day ago" msgid_plural "last updated %d days ago" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "dernier enregistrement %d jours" +msgstr[1] "dernière %d mise à jour" #: templates/email/oxfordshire/archive.txt:9 #, perl-format msgid "report" msgid_plural "reports" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "rapport" +msgstr[1] "rapports" -#~ msgid "" -#~ "%s sends different categories of problem\n" -#~ "to the appropriate council, so problems within the boundary of a particular council\n" -#~ "might not match the problems sent to that council. For example, a graffiti report\n" -#~ "will be sent to the district council, so will appear in both of the district\n" -#~ "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" -#~ "for the county council." -#~ msgstr "" -#~ "%s envoie différentes catégories de problèmes \n" -#~ "à l'administration appropriée. Les problèmes situés sur le territoire d'une administration pourraient ne pas correspondre aux problèmes envoyés à cette administration.\n" -#~ " Par exemple, un rapport graffiti sera envoyé à l'administration\n" -#~ " de district, et apparaîtrait dans les deux administrations." - -#~ msgid "%s ward, %s" -#~ msgstr "Localité %s, %s" +#, fuzzy +#~ msgid "Current state of filtered reports" +#~ msgstr "Vos rapports hors ligne" -#~ msgid "%s, within %s ward" -#~ msgstr "%s, dans la localité %s" +#~ msgid "(Email in abuse table)" +#~ msgstr "(email dans la liste des abus)" -#~ msgid "(alternatively the RSS feed can be customised, within %s)" -#~ msgstr "(alternativement le flux RSS peut être personnalisé, dans %s)" +#~ msgid "14-30 days old" +#~ msgstr "14-30 jours" -#~ msgid "-- Pick a property type --" -#~ msgstr "-- Choisissez un type de propriété --" +#~ msgid "7-14 days old" +#~ msgstr "7-14 jours" -#~ msgid "Closed reports" -#~ msgstr "rapports fermés" +#~ msgid "Average time to council marking fixed (days)" +#~ msgstr "Temps moyen pour fixer le marquage du conseil (jours)" -#~ msgid "Closed:" -#~ msgstr "Clos :" +#~ msgid "Average time to first council state change (days)" +#~ msgstr "Durée moyenne du premier changement d'état de l'administration (jours)" -#~ msgid "Duplicate" -#~ msgstr "Dupliqué" +#~ msgid "By Date" +#~ msgstr "Par Date" -#~ msgid "Fixed reports" -#~ msgstr "rapports résolus" +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Cliquer ici ou saisir au format jj/mm/aaaa" -#~ msgid "Fixed:" -#~ msgstr "Résolu :" +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Rapports confirmés entre %s et %s" -#~ msgid "Here are the types of local problem alerts for ‘%s’." -#~ msgstr "Voici les types de problèmes locaux pour « %s »." +#~ msgid "Council has marked as closed" +#~ msgstr "Administration est marquée fermée" -#~ msgid "In Progress" -#~ msgstr "En cours" +#~ msgid "Council has marked as fixed" +#~ msgstr "Administration est marquée fixe" -#~ msgid "Internal referral" -#~ msgstr "Référence interne" +#~ msgid "Council has marked as in progress" +#~ msgstr "Administration est marquée en cours" -#~ msgid "Investigating" -#~ msgstr "En examen" +#~ msgid "Council has marked as investigating" +#~ msgstr "Administration est marquée comme en investigation" -#~ msgid "No further action" -#~ msgstr "Ne peut être résolu" +#~ msgid "Council has marked as planned" +#~ msgstr "Administration est marquée plannifiée" -#~ msgid "Not Responsible" -#~ msgstr "Pas responsable" +#~ msgid "Get Count" +#~ msgstr "Obtenir le compte" -#~ msgid "Or problems reported to:" -#~ msgstr "Ou problèmes signalés à :" +#~ msgid "Hide old" +#~ msgstr "Cacher les anciens" -#~ msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" -#~ msgstr "Ou vous pouvez vous abonner à une alerte en fonction de la commune dans laquelle vous êtes :" +#~ msgid "Include unconfirmed reports" +#~ msgstr "Inclure les rapports non confirmés" -#~ msgid "Please choose a property type" -#~ msgstr "Merci de choisir un type de propriété" +#~ msgid "Invalid end date" +#~ msgstr "Date de fin invalide" -#~ msgid "Problems within the boundary of:" -#~ msgstr "Problèmes à l'intérieur des limites de :" +#~ msgid "Invalid start date" +#~ msgstr "Date de début invalide" -#~ msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -#~ msgstr "Sélectionnez le type d'alerte que vous souhaitez et cliquez sur le bouton pour obtenir un flux RSS ou entrez votre adresse e-mail pour vous abonner à une alerte email." +#~ msgid "Last 4 weeks" +#~ msgstr "Les 4 dernières semaines" -#~ msgid "The simplest alert is our geographic one:" -#~ msgstr "La plus simple de nos alertes est la géographique :" +#~ msgid "Less than 7 days old" +#~ msgstr "Moins de 7 jours" -#~ msgid "closed as a duplicate report" -#~ msgstr "rapport marqué comme dupliqué" +#~ msgid "No council" +#~ msgstr "Pas d'administration" -#~ msgid "marked as action scheduled" -#~ msgstr "action marquée comme établie" +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Notez que quand les rapports non confirmés sont inclus nous utilisons la date de création du rapport, qui peut être dans un autre mois que la date de confirmation, ce qui peut légèrement faire varier les chiffres." -#~ msgid "marked as an internal referral" -#~ msgstr "marqué comme une référence interne" +#~ msgid "Show old" +#~ msgstr "Montrer les anciens" -#~ msgid "marked as closed" -#~ msgstr "marqué comme terminé" +#~ msgid "Total marked" +#~ msgstr "Total marqué" -#~ msgid "marked as fixed" -#~ msgstr "marqué(s) comme réglé(s)" +#~ msgid "Total marked as fixed" +#~ msgstr "Total marqué comme fixé" -#~ msgid "marked as in progress" -#~ msgstr "marqué comme en cours" +#~ msgid "Total not marked" +#~ msgstr "Total non marqué" -#~ msgid "marked as investigating" -#~ msgstr "marqué comme en cours d'investigation" +#~ msgid "Total reports received" +#~ msgstr "Total des rapports reçus" -#~ msgid "marked as no further action" -#~ msgstr "marqué comme impossible à résoudre" +#~ msgid "Unfixed reports" +#~ msgstr "rapports non résolus" -#~ msgid "marked as planned" -#~ msgstr "marqué comme planifié" +#~ msgid "User has marked as fixed" +#~ msgstr "L'utilisateur a marqué comme fixé" -#~ msgid "or" -#~ msgstr " ou " +#~ msgid "Week To Date" +#~ msgstr "Semaine à ce jour" -#~ msgid "reopened" -#~ msgstr "réouvert" +#~ msgid "Year" +#~ msgstr "Année" diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po index 8275a2d6968..d3de7830e41 100644 --- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Hebrew (Israel) (https://www.transifex.com/mysociety/teams/12067/he_IL/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "" @@ -32,6 +32,10 @@ msgstr "" msgid " or " msgstr "או" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "" @@ -91,7 +100,7 @@ msgstr "" msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -138,7 +142,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -159,8 +163,8 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "" @@ -173,14 +177,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -189,16 +185,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -207,33 +203,49 @@ msgstr "" msgid "%s live problems" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my report by email/text" +msgstr "" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my update by email/text" +msgstr "" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +msgid "No let me sign in by email or text" +msgstr "" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -247,11 +259,16 @@ msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +msgid "Add email address" +msgstr "" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -273,11 +290,16 @@ msgstr "" msgid "Add option" msgstr "" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -287,23 +309,23 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -327,9 +349,10 @@ msgstr "" msgid "Alert me to future updates" msgstr "" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -338,12 +361,13 @@ msgstr "" msgid "All Reports" msgstr "" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -358,17 +382,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -405,7 +429,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -416,7 +441,7 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -430,7 +455,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "" @@ -442,7 +467,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -458,12 +483,16 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +msgid "Auto Response" +msgstr "" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -471,18 +500,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -496,20 +517,20 @@ msgstr "" msgid "Back" msgstr "" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" +msgid "Ban user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "" @@ -520,14 +541,10 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -540,8 +557,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -552,30 +570,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "קטגוריה: %s" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -583,17 +607,17 @@ msgstr "" msgid "Category:" msgstr "קטגוריה" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "קטגוריה: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -601,10 +625,15 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "החלף ססמא" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +msgid "Change phone number" +msgstr "" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -626,19 +655,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "" @@ -666,18 +690,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "" @@ -692,16 +717,17 @@ msgid "Cobrand" msgstr "" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -709,7 +735,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "תצורה" @@ -718,7 +744,7 @@ msgstr "תצורה" msgid "Confirm" msgstr "אשר" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "אשר חשבון" @@ -737,14 +763,10 @@ msgstr "אישור" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "אישר" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -771,8 +793,8 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "" @@ -790,43 +812,16 @@ msgstr "עירייה" msgid "Council contacts for %s" msgstr "" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "ספירה" @@ -847,37 +842,41 @@ msgstr "צור קטגוריה" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +msgid "Current token:" +msgstr "" + +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" msgstr "" #: templates/web/base/admin/bodies.html:9 @@ -890,14 +889,14 @@ msgstr "" msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -909,12 +908,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -925,8 +924,8 @@ msgstr "" msgid "Deleted" msgstr "נמחק" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -942,6 +941,10 @@ msgstr "תיאור" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -954,6 +957,10 @@ msgstr "פרטים" msgid "Details:" msgstr "" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "" @@ -967,8 +974,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -977,7 +984,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -985,7 +992,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1005,11 +1012,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1029,9 +1036,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "ערוך" @@ -1041,33 +1049,33 @@ msgstr "ערוך" msgid "Edit body details" msgstr "ערוך פרטי גוף" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "ערוך בעיה %d" @@ -1088,7 +1096,6 @@ msgstr "עורך" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1096,17 +1103,20 @@ msgstr "עורך" msgid "Email" msgstr "דואר אלקטרוני" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "דואר אלקטרוני הוסף לרשימת המשתמשים לרעה" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "דואר אלקטרוני הוסף לרשימת המשתמשים לרעה" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1115,19 +1125,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "דואר אלקטרוני כבר ברשימת המשתמשים לרעה" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "דואר אלקטרוני:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "דואר אלקטרוני: %s" @@ -1140,16 +1149,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/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +msgid "End Date" msgstr "" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1170,14 +1179,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" @@ -1195,8 +1204,8 @@ msgstr "" msgid "Error" msgstr "" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1221,7 +1230,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1237,7 +1246,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1249,7 +1258,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" @@ -1260,7 +1269,7 @@ msgstr "" msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1290,21 +1299,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "" @@ -1312,7 +1322,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "" @@ -1321,7 +1331,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1329,8 +1339,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "" @@ -1350,7 +1360,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1370,8 +1380,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1404,12 +1418,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "" @@ -1417,7 +1431,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1425,6 +1439,14 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" +#: templates/web/base/dashboard/index.html:93 +msgid "Group by %s" +msgstr "" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "" @@ -1445,21 +1467,25 @@ msgstr "" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +msgid "Here are some other nearby reports:" +msgstr "" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1480,21 +1506,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1506,7 +1529,7 @@ msgstr "" msgid "History" msgstr "" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "" @@ -1563,12 +1586,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1577,7 +1608,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1586,7 +1617,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1658,11 +1689,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1674,7 +1701,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1686,26 +1713,18 @@ msgstr "" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1724,7 +1743,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1749,12 +1768,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1780,18 +1794,14 @@ msgstr "" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1800,13 +1810,13 @@ msgstr "" msgid "List all reported problems" msgstr "" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "" #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1838,12 +1848,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1851,11 +1864,11 @@ msgstr "" msgid "MAP" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1867,11 +1880,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1891,45 +1904,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1947,9 +1960,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1960,19 +1973,23 @@ msgstr "" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1982,12 +1999,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2001,19 +2018,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2034,6 +2055,10 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +msgid "New phone number:" +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2063,18 +2088,19 @@ msgstr "" msgid "New reports" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2082,7 +2108,7 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2094,22 +2120,18 @@ msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "" @@ -2139,6 +2161,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "" @@ -2161,15 +2187,15 @@ msgstr "" msgid "None" msgstr "" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2188,7 +2214,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "" @@ -2202,10 +2228,6 @@ msgstr "" msgid "Note" msgstr "" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2233,37 +2255,46 @@ msgstr "" msgid "Now to submit your update…" msgstr "" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2302,23 +2333,29 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +msgid "Other wards" +msgstr "" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2336,19 +2373,19 @@ msgstr "" msgid "Parent" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "" @@ -2356,7 +2393,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2364,19 +2401,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "" @@ -2392,7 +2434,7 @@ msgstr "" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2418,12 +2460,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "" @@ -2445,25 +2492,33 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: 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:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2478,39 +2533,46 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: 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:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "" @@ -2519,55 +2581,61 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +msgid "Please enter a valid email or phone number" +msgstr "" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "" @@ -2616,7 +2684,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +msgid "Please provide a duplicate ID or public update for this report." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2656,6 +2728,11 @@ msgstr "" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "" @@ -2665,7 +2742,7 @@ msgid "Please write your update here" msgstr "" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2674,15 +2751,15 @@ msgstr "" msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "" @@ -2694,11 +2771,11 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2715,7 +2792,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "" @@ -2739,21 +2816,21 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -2778,7 +2855,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2803,7 +2880,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" @@ -2812,12 +2890,12 @@ msgstr "" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2830,12 +2908,12 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "" @@ -2890,7 +2968,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2915,7 +2993,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2929,7 +3007,7 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2951,9 +3029,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2961,12 +3039,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -2995,11 +3077,11 @@ msgstr "" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3014,17 +3096,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "" @@ -3038,27 +3120,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3067,8 +3149,8 @@ msgstr "" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3076,10 +3158,9 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "" @@ -3095,7 +3176,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3107,7 +3188,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3160,21 +3241,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3193,17 +3275,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -3213,21 +3295,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3238,12 +3320,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3261,7 +3343,7 @@ msgstr "" msgid "Search Users" msgstr "" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "" @@ -3272,6 +3354,7 @@ msgid "Search:" msgstr "" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3284,7 +3367,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3293,8 +3376,8 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "" @@ -3314,11 +3397,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "" @@ -3327,11 +3415,11 @@ msgid "Sent:" msgstr "" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3340,9 +3428,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3350,19 +3438,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3370,40 +3458,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3414,12 +3499,16 @@ msgstr "" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -3435,7 +3524,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "" @@ -3448,15 +3537,19 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3489,20 +3582,20 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +msgid "Start Date" msgstr "" #: templates/web/base/admin/body.html:73 @@ -3512,15 +3605,18 @@ msgstr "" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 msgid "State changed to:" msgstr "" @@ -3533,16 +3629,18 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "" @@ -3552,7 +3650,7 @@ msgstr "" msgid "Status" msgstr "" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "" @@ -3565,7 +3663,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "קטגוריה" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "" @@ -3582,18 +3685,19 @@ msgstr "" msgid "Subject:" msgstr "" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3634,7 +3738,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3642,25 +3746,30 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +msgid "Summary statistics" +msgstr "" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -3668,14 +3777,14 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -3683,7 +3792,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3710,7 +3819,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" @@ -3726,7 +3835,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3736,11 +3845,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "" @@ -3772,8 +3881,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3806,8 +3915,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "" @@ -3849,7 +3958,7 @@ msgstr "" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3874,7 +3983,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3885,33 +3994,37 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3919,7 +4032,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "" @@ -3974,26 +4087,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4010,7 +4131,7 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4020,23 +4141,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4047,7 +4168,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4059,20 +4180,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" @@ -4084,44 +4206,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4134,18 +4248,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "" @@ -4160,7 +4275,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4169,15 +4288,11 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -4187,13 +4302,14 @@ msgstr "" msgid "Unknown error" msgstr "" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4218,12 +4334,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4231,16 +4347,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -4254,18 +4370,18 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4273,7 +4389,7 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" @@ -4320,40 +4436,77 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "דואר אלקטרוני הוסף לרשימת המשתמשים לרעה" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "דואר אלקטרוני כבר ברשימת המשתמשים לרעה" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +msgid "User in abuse table" msgstr "" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +msgid "User:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +msgid "Verify email address" +msgstr "" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +msgid "Verify phone number" +msgstr "" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4375,12 +4528,7 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4390,20 +4538,24 @@ msgstr "" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." +msgid "We found more than one match for that location." msgstr "" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "" @@ -4411,6 +4563,11 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4420,8 +4577,8 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4449,7 +4606,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4472,6 +4629,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4488,16 +4649,7 @@ msgstr "" msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4512,7 +4664,7 @@ msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "" @@ -4525,7 +4677,7 @@ msgstr "" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4542,7 +4694,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4568,7 +4720,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4576,7 +4728,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4603,18 +4755,34 @@ msgstr "" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +msgid "You have successfully added your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" +#: templates/web/base/auth/change_phone.html:15 +msgid "You have successfully confirmed your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +msgid "You have successfully removed your phone number." +msgstr "" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +msgid "You have successfully verified your phone number." +msgstr "" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4638,36 +4806,42 @@ msgid "Your Reports" msgstr "" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +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 "" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4678,19 +4852,19 @@ msgstr "" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4701,8 +4875,8 @@ msgstr "" msgid "Your password has been changed" msgstr "" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "" @@ -4711,7 +4885,7 @@ msgstr "" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "" @@ -4720,25 +4894,39 @@ msgstr "" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +msgid "Your token has been generated" +msgstr "" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4755,8 +4943,8 @@ msgstr "" msgid "didn't use map" msgstr "" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4779,22 +4967,23 @@ msgstr "" msgid "less than a minute" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "" @@ -4834,7 +5023,7 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4842,11 +5031,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4854,14 +5043,24 @@ msgstr "" msgid "used map" msgstr "" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "דואר אלקטרוני כבר ברשימת המשתמשים לרעה" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "דואר אלקטרוני הוסף לרשימת המשתמשים לרעה" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4923,35 +5122,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po index 427e37d57df..def4f599567 100644 --- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Croatian (https://www.transifex.com/mysociety/teams/12067/hr/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "i" @@ -32,6 +32,10 @@ msgstr "i" msgid " or " msgstr "ili" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d izmjene od strane %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s kontakti vijeća – %s potvrđeni, %s nepotvrđeni" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s ažuriranje uživo" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s Upitnici poslani – %s odgovoreno (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s Upitnici poslani – %s odgovoreno (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Email na crnoj listi)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(grafiti, ilegalno odlaganje otpada, oštećeni kolnici, klupe, lampe...)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -161,8 +165,8 @@ msgstr "(poslano na obje adrese)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS izvor za probleme unutar %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Izaberi kategoriju --" @@ -175,14 +179,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -191,16 +187,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -209,33 +205,52 @@ msgstr "" msgid "%s live problems" msgstr "%s postojeći problemi" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "No Potvrdi moju prijavu e-mailom" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "No Potvrdi moju prijavu e-mailom" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "No Potvrdi moje ažuriranje e-mailom" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "No Potvrdi moje ažuriranje e-mailom" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "No prijavi se e-mailom" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "No prijavi se e-mailom" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Da Imam password" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -249,11 +264,17 @@ msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Onemogući e-mail adrese" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -276,11 +297,17 @@ msgstr "Dodaj novu kategoriju" msgid "Add option" msgstr "(nije obavezno)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "Vaš broj telefona" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -290,23 +317,23 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Dodano %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -330,9 +357,10 @@ msgstr "Upozorenje %d onemogućeno (kreirano%s)" msgid "Alert me to future updates" msgstr "Javi mi buduće promjene" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -341,12 +369,13 @@ msgstr "" msgid "All Reports" msgstr "Sve Prijave" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -362,17 +391,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Sve prijave" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Sve prijave između %s i %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -410,7 +439,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -421,7 +451,7 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -435,7 +465,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "" @@ -447,7 +477,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -463,12 +493,16 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +msgid "Auto Response" +msgstr "" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -476,18 +510,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -501,20 +527,21 @@ msgstr "" msgid "Back" msgstr "" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Onemogući e-mail adrese" +#, fuzzy +msgid "Ban user" +msgstr "Označi korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "" @@ -525,14 +552,10 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Po datumu" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -545,8 +568,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Ne možete vidjeti mapu? Preskoči ovaj korak" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -557,30 +581,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategorija" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategorija" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr " Postotak popravaka za kategoriju > staro 4 tjedna" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -588,17 +618,17 @@ msgstr " Postotak popravaka za kategoriju > staro 4 tjedna" msgid "Category:" msgstr "Kategorija:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategorija: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -606,10 +636,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Promijeni lozinku" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "Vaš broj telefona" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -631,19 +667,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Kliknite mapu da prijavite problem" @@ -671,18 +702,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Zatvoreno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Zatvorilo je odgovorno tijelo" @@ -697,16 +729,17 @@ msgid "Cobrand" msgstr "Cobrand" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Cobrand podaci:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -714,7 +747,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -723,7 +756,7 @@ msgstr "" msgid "Confirm" msgstr "Potvrdi" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Potvrdi račun" @@ -742,14 +775,10 @@ msgstr "Potvrda" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Potvrđeno" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Potvrđene prijave između %s i %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -776,8 +805,8 @@ msgstr "Kontaktiraj tim" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Nepoznati korisnik" @@ -795,43 +824,16 @@ msgstr "Vijeće" msgid "Council contacts for %s" msgstr "Kontakti vijeća za %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "odgovorno tijelo ref: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Vijeće:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Brojač" @@ -853,39 +855,44 @@ msgstr "Kreiraj kategoriju" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Kreirano" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Kreirano:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Trenutno stanje" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -896,14 +903,14 @@ msgstr "" msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Nadzorna ploča" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -915,12 +922,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -931,8 +938,8 @@ msgstr "" msgid "Deleted" msgstr "Izbrisano" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -948,6 +955,10 @@ msgstr "" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -960,6 +971,10 @@ msgstr "Detalji" msgid "Details:" msgstr "Detalji:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Prenešeno" @@ -973,8 +988,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -983,7 +998,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -991,7 +1006,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1011,11 +1026,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1035,9 +1050,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Uredi" @@ -1047,33 +1063,33 @@ msgstr "Uredi" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Uređivanje problema %d" @@ -1094,7 +1110,6 @@ msgstr "Urednik" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1102,17 +1117,20 @@ msgstr "Urednik" msgid "Email" msgstr "E-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "E-mail dodan na listu zloupotrebe" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Lozinka (neobvezno)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1121,19 +1139,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "E-mail je već na listi zloupotrebe" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "E-mail:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "" @@ -1146,17 +1163,18 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" -msgstr "" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" +msgstr "Po datumu" #: templates/web/base/admin/open311-form-fields.html:21 msgid "Endpoint" @@ -1176,14 +1194,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Unesi obližnji poštanski broj ili ime ulice i kvarta" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Unesi ime obližnje ulice i kvarta" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Unesi lozinku" @@ -1201,8 +1219,8 @@ msgstr "Unesi detalje o problemu" msgid "Error" msgstr "Greška" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1227,7 +1245,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1243,7 +1261,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1255,7 +1273,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1267,7 +1285,7 @@ msgstr "Dodatni podaci:" msgid "Extra data:" msgstr "Dodatni podaci:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1297,21 +1315,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Popravljeno" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Popravljeno - odgovorno tijelo" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Popravljeno - Korisnik" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "" @@ -1319,7 +1338,7 @@ msgstr "" msgid "Flag user" msgstr "Označi korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Označen" @@ -1328,7 +1347,7 @@ msgstr "Označen" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1336,8 +1355,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Označen:" @@ -1357,7 +1376,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1377,8 +1396,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Često postavljana pitanja" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1411,12 +1434,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Idi" @@ -1424,7 +1447,7 @@ msgstr "Idi" msgid "Going to send questionnaire?" msgstr "Pošalji upitnik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1432,6 +1455,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Grafikon nastanka problema prema položaju tijekom vremena" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "od %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Je li ovaj problem popravljen?" @@ -1452,21 +1484,26 @@ msgstr "Pomoć" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Fotografije posljednjih obližnjih prijava" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Zdravo %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skriveno" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1487,21 +1524,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Sakrij staro" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Sakrij pinove" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1513,7 +1547,7 @@ msgstr "" msgid "History" msgstr "Povijest" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "" @@ -1570,12 +1604,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1584,7 +1626,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1593,7 +1635,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1665,11 +1707,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Uključi nepotvrđene prijave" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Pogrešno ima_foto vrijednost\"%s\"" @@ -1681,7 +1719,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1693,26 +1731,18 @@ msgstr "" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Nevažeća odgovorna_vrijednost agencije %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Nevažeći datum završetka" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Naveden nevažeći %s format." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Nevažeći datum početka" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1731,7 +1761,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1756,12 +1786,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1787,18 +1812,14 @@ msgstr "Posljednje ažuriranje:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1807,13 +1828,13 @@ msgstr "" msgid "List all reported problems" msgstr "Izlistaj sve prijavljenje probleme" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Učitavanje" #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1845,12 +1866,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1858,11 +1882,11 @@ msgstr "" msgid "MAP" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1874,11 +1898,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1898,45 +1922,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Nedostaje nadležni_ID" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Mjesec" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1954,9 +1978,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1967,19 +1991,23 @@ msgstr "Ime" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Ime:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1989,12 +2017,12 @@ msgstr "Najbliža imenovana cesta smještena pokraj oznake na mapi (automatski g msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Najbliži poštanski broj pokraj oznake na mapi (automatski generiran): %s (%sm away)" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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 mapi (automatski generirano pomoću Bing Maps): %s" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2010,19 +2038,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Novi kontakt dodan u kategoriju" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2043,6 +2075,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "Vaš broj telefona" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2072,18 +2109,19 @@ msgstr "Novi problemi unutar {{NAME}} granice na Popravi.to" msgid "New reports" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Novo stanje" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2091,7 +2129,7 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2103,22 +2141,18 @@ msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Ne" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Nema odgovornog tijela" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Nije odabrano odgovorno tijelo" @@ -2148,6 +2182,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "" @@ -2170,15 +2208,15 @@ msgstr "Bez podrške" msgid "None" msgstr "Nijedan" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2197,7 +2235,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Nije prethodno prijavljeno" @@ -2211,10 +2249,6 @@ msgstr "Nije prijavljeno odgovornom tijelu" msgid "Note" msgstr "Napomena" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Imajte na umu da kada uključujemo nepotvrđene prijave koristimo datum kada je prijava napravljena koji ne mora biti u istom mjesecu kada je prijava potvrđena pa stoga datumi mogu varirati" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2242,37 +2276,46 @@ msgstr "Podnesite svoju prijavu…" msgid "Now to submit your update…" msgstr "Pošaljite svoje ažuriranje…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Staro stanje" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2311,23 +2354,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Drugo" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "druga područja:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2345,19 +2395,19 @@ msgstr "Stranica nije pronađena" msgid "Parent" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Djelomično" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Lozinka (neobvezno)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Lozinka:" @@ -2365,7 +2415,7 @@ msgstr "Lozinka:" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2373,19 +2423,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Telefonski broj (neobavezan)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2401,7 +2456,7 @@ msgstr "Telefon:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2427,12 +2482,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Fotografije posljednjih obližnjih prijava" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "" @@ -2454,25 +2514,34 @@ msgstr "Molimo da budete pristojni, jezgroviti i jasni." msgid "Please check the passwords and try again" msgstr "Provjeri lozinku i pokušaj ponovno" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Provjerite je li vaša e-mail adresa točna" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Izaberi kategoriju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2487,39 +2556,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Unesi poruku" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Unesi poruku" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Unesi lozinku" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Unesi predmet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Unesi valjani e-mail" @@ -2528,55 +2605,62 @@ msgstr "Unesi valjani e-mail" msgid "Please enter a valid email address" msgstr "Unesi valjanu e-mail adresu" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Unesi valjani e-mail" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Unesi detalje" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Unesi svoj e-mail" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Unesi svoju e-mail adresu" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Unesi svoje ime" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Unesite svoje ime" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Unesite svoje prezime" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Unesite svoju titulu" @@ -2625,7 +2709,12 @@ msgstr "" msgid "Please note:" msgstr "Napominjemo:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Molimo navedite obrazloženje ponovnog otvaranja ove prijave" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2665,6 +2754,11 @@ msgstr "Navedite je li problem rješen " msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Napiši poruku" @@ -2674,7 +2768,7 @@ msgid "Please write your update here" msgstr "Ovdje ažurirajte" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Objavi" @@ -2683,15 +2777,15 @@ msgstr "Objavi" msgid "Posted anonymously at %s" msgstr "Objavljeno anonimno na %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Objavio %s na %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Objavio %s (%s) na %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Objavio %s na %s" @@ -2703,11 +2797,11 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2724,7 +2818,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privatno" @@ -2748,21 +2842,21 @@ msgstr "Problem %s potvrđen" msgid "Problem %s sent to council %s" msgstr "Problem %s poslan odgovornom tijelu %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Analiza problema prema stanju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problem označen kao otvoren." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Stanje problema izmijenjeno na temelju rezultata ankete" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemi" @@ -2789,7 +2883,7 @@ msgstr "Problems nedavno prijavljeni kao popravljeni na Popravi.to" msgid "Problems within %.1fkm of %s" msgstr "Problemi unutar%.1fkm od ove lokacije" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2815,7 +2909,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ažuriranje" @@ -2824,12 +2919,12 @@ msgstr "Ažuriranje" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Lozinka nije obvezna, ali će vam omogućiti lakše prijavljivanje problema, ažuriranja i upravljanje vašim izvješćima." @@ -2842,12 +2937,12 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "" @@ -2902,7 +2997,7 @@ msgstr "RSS izvor za %s, unutar %s ward" msgid "RSS feed of nearby problems" msgstr "RSS izvor za okolne probleme" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2927,7 +3022,7 @@ msgstr "RSS izvor za ažuriranja ovog problema" msgid "Receive email when updates are left on this problem." msgstr "Primite e-mail s ažuriranjima ovog problema" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2941,7 +3036,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Nedavno prijavljeni problemi" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2965,9 +3060,9 @@ msgstr "Ukloni oznaku" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2975,12 +3070,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Ukloni fotografiju (nije moguće poništiti!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3009,11 +3108,11 @@ msgstr "Prijavi zloupotrebu" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Prijava za %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3028,17 +3127,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Prijavi, pregledaj ili raspravljaj o lokalnim problemima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Prijavljeno anonimno %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Prije prijavljeno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Prijavio %s za %s" @@ -3052,27 +3151,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Prijavljeno %s u kategoriju anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Prijavio %s u kategoriju %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Prijavio %s anonimno %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Prijavio %s %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Prijavio %s u kategoriju %s anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Prijavio %s u %s kategoriju %s u %s" @@ -3081,8 +3180,8 @@ msgstr "Prijavio %s u %s kategoriju %s u %s" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3090,10 +3189,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Prijavljivanje problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "" @@ -3110,7 +3208,7 @@ msgstr "" msgid "Reports by destination" msgstr "Prijavio %s za %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3122,7 +3220,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3177,21 +3275,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3210,17 +3309,17 @@ 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:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -3230,21 +3329,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3255,12 +3354,12 @@ msgstr "Spremi promjene" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3278,7 +3377,7 @@ msgstr "Pretraži prijave" msgid "Search Users" msgstr "Pretraži korisnike" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "" @@ -3289,6 +3388,7 @@ msgid "Search:" msgstr "Pretraži:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3301,7 +3401,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3310,8 +3410,8 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "" @@ -3331,11 +3431,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Pošalji %s %s naknadno" @@ -3344,11 +3449,11 @@ msgid "Sent:" msgstr "Poslano:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Servis:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3357,9 +3462,9 @@ msgid "Share" msgstr "Podijeli" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3367,19 +3472,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3387,40 +3492,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Prikaži moje ime javno" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Prikaži staro" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Prikaži pinove" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3431,12 +3533,16 @@ msgstr "Prijavi se" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Prijavi se ili kreiraj korisnički račun" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Odjavi se" @@ -3452,7 +3558,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Fotografije nedavnih prijava" @@ -3465,15 +3571,19 @@ msgstr "Tekst za lakšu lokalizaciju" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3506,20 +3616,20 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +msgid "Start Date" msgstr "" #: templates/web/base/admin/body.html:73 @@ -3529,15 +3639,18 @@ msgstr "" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Stanje" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Spremi promjene" @@ -3551,17 +3664,19 @@ msgstr "Spremi promjene" msgid "State:" msgstr "Stanje:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Stanje" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistika" @@ -3571,7 +3686,7 @@ msgstr "Statistika" msgid "Status" msgstr "" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "I dalje otvoreno, putem upitnika %s" @@ -3584,7 +3699,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Kategorija" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "" @@ -3601,18 +3721,19 @@ msgstr "Predmet" msgid "Subject:" msgstr "Predmet:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Pošalji" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3654,7 +3775,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3662,25 +3783,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Sažetak" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Sažetak prijava" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Sažetak prijava" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Rezultati ispitivanja" @@ -3688,14 +3815,14 @@ msgstr "Rezultati ispitivanja" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -3703,7 +3830,7 @@ msgstr "Tekst" msgid "Text only version" msgstr "Tekst samo verzija" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3730,7 +3857,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Hvala na učitavanju slike. Sada trebamo locirati problem pa vas molimo da unesete naziv obližnje ulice ili poštanski broj u gornji okvir : :" @@ -3746,7 +3873,7 @@ msgstr "Slika nije ispravno učitana (%s), molimo pokušajte ponovno." 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Lokacija se ne nalazi u Hrvatskoj. Molimo pokušajte ponovno." @@ -3756,11 +3883,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Navedeni problem će biti ponovno poslan" @@ -3792,8 +3919,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3826,8 +3953,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Greška je: %s" @@ -3869,7 +3996,7 @@ msgstr "Posljednji riješeni problemi" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Posljednji prijavljeni problemi za {{IME}}" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3894,7 +4021,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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" @@ -3905,33 +4032,38 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Došlo je do problema s kombinacijom Vašeg e-maila i lozinke.Ako se ne možete sjetiti ili nemate lozinku, molimo odaberite ‘ model prijave putem e-maila ’." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Došlo je do problema s kombinacijom Vaše e-maila i lozinke. Molimo pokušajte ponovno." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Došlo je do problema s kombinacijom Vašeg e-maila i lozinke.Ako se ne možete sjetiti ili nemate lozinku, molimo odaberite ‘ model prijave putem e-maila ’." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Došlo je do problema pri ažuriranju. Molimo pokušajte ponovno." @@ -3939,7 +4071,7 @@ msgstr "Došlo je do problema pri ažuriranju. Molimo pokušajte ponovno." msgid "There were problems with your report. Please see below." msgstr "Došlo je do problema pri prijavi. Detalje pogledajte u nastavku." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Došlo je do problema pri ažuriranju. Detalje pogledajte u nastavku." @@ -3994,26 +4126,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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 poslan je oboma odgovornim tijelima koji pokrivaju mjesto problema. Molimo vas da zanemarite e-mail ukoliko problem ne ulazi u vaše područje ili nam javite o kakvoj je kategoriji problema riječ kako bismo ga unijeli u naš sustav." -#: perllib/FixMyStreet/Script/Reports.pm:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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 ukoliko niste nadležni za ovaj problem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Potrebna informacija" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Ovo je stranica za razvojne programere; ovdje se sve može prekinuti u bilo kojem trenutku. Baza će biti povremeno izbrisana." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4030,7 +4170,7 @@ msgstr "Problem još nije riješen" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4040,23 +4180,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Ova prijava je trenutno označena kao zatvorena." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Prijava je trenutno označena kao popravljena." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Prijava je trenutno označena kao otvorena." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4067,7 +4207,7 @@ msgstr "Stranica sadrži i fotografiju problem, dodanu od strane korisnika." msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Vremenska skala" @@ -4079,20 +4219,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Naslov" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Kako biste vidjeli lokalne probleme,molimo Vas da unesete poštanski broj ili naziv ulice i područje." @@ -4104,44 +4245,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "Karta točne lokacije ovog problema" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Ukupno" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Ukupno" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4154,18 +4287,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "" @@ -4180,7 +4314,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4189,15 +4327,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Nepotvrđeno" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Nepoznato" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Nepoznat tip upozorenja" @@ -4207,13 +4341,14 @@ msgstr "Nepoznat tip upozorenja" msgid "Unknown error" msgstr "" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Nepoznat IB problema" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4238,12 +4373,12 @@ msgstr "Ažuriranje u nastavku dodao je anonimni korisnik u %s" msgid "Update below added by %s at %s" msgstr "Ažuriranje u nastavku dodao %s u %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4251,16 +4386,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "Ažuraranje dodao {{ime}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Ažuriranjem se status problema promijenio u %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Ažuriranjem je problem označen kao popravljen" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Ažuriranjem je problem ponovno otvoren" @@ -4274,20 +4409,20 @@ msgstr "Status ažuriranja" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Objavio %s (%s) na %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Objavio %s na %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4295,7 +4430,7 @@ msgid "Updated!" msgstr "Ažurirano!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Ažuriranja" @@ -4342,40 +4477,81 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "E-mail dodan na listu zloupotrebe" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "E-mail je već na listi zloupotrebe" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Korisnička oznaka uklonjena" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Korisnik označen" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "(Email na crnoj listi)" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Korisnici" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Korisnici" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Vrijednosti ažurirane" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Vaša e-mail adresa" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Vaš broj telefona" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4397,12 +4573,7 @@ msgstr "Prikaz lokacije" msgid "Viewing a problem" msgstr "Prikaz problema" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4412,20 +4583,25 @@ msgstr "Općine ove županije" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Pronađeno je više rezultata za tnavedenulokaciju. Prikazano je do deset rezlutata. Ukoliko nije naveden traženi problem, molimo pokušajte s drugom pretragom." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Žao nam je, ne možemo pronaći tu lokaciju." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4433,6 +4609,12 @@ msgstr "Shvaćamo da bi za ovaj problem moglo biti odgovorno% s, međutim, trenu msgid "We send it to the council on your behalf" msgstr "Poslan je odgovornom tijelu u Vaše ime" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Pronađeno je više rezultata za tnavedenulokaciju. Prikazano je do deset rezlutata. Ukoliko nije naveden traženi problem, molimo pokušajte s drugom pretragom." + #: 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." @@ -4442,8 +4624,8 @@ msgstr "Vaše privatne podatke koristimo u skladu s našim msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4471,7 +4653,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4494,6 +4676,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "Osim pretraživanja prijava, moguće je pretražiti i odgovorne_agencije kako biste ograničili prijave na one poslane određenom uredu. Pojam za pretraživanje je IB pojedinog ureda kojeg možete saznati pomoću MaPit." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4510,16 +4696,7 @@ msgstr "Pisanje velikim tiskanim slovima i bez interpunkcijskih znakova čini po msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Godina" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4534,7 +4711,7 @@ msgstr "Godina" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Da" @@ -4547,7 +4724,7 @@ msgstr "Da, imam lozinku" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4564,7 +4741,7 @@ msgstr "Sljedeće ažuriranje prijavljujete jer je uvredljivo, sadrži osobne po msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4590,7 +4767,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4598,7 +4775,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4625,18 +4802,34 @@ msgstr "Odjavljeni ste" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Locirali ste problem na mjestu označenom zelenom iglom na karti. Ako to nije točna lokacija, jednostavno opet kliknite na karti ." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +msgid "You have successfully added your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" +#: templates/web/base/auth/change_phone.html:15 +msgid "You have successfully confirmed your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +msgid "You have successfully removed your phone number." +msgstr "" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Uapješno ste se prijavili; molimo provjerite i potvrdite točnost Vaših podataka:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +msgid "You have successfully verified your phone number." +msgstr "" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4660,36 +4853,43 @@ msgid "Your Reports" msgstr "Vaše prijave" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Vaš e-mail" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Vaša e-mail adresa" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Vaša e-mail adresa" + #: 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šimpravilima o privatnosti" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4700,19 +4900,19 @@ msgstr "Ime" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4723,8 +4923,8 @@ msgstr "Lozinka" msgid "Your password has been changed" msgstr "Vaša lozinka je promijenjena" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Vaš broj telefona" @@ -4733,7 +4933,7 @@ msgstr "Vaš broj telefona" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Vaše prijave" @@ -4742,25 +4942,40 @@ msgstr "Vaše prijave" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Vaša lozinka je promijenjena" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Vaša ažuriranja" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4777,8 +4992,8 @@ msgstr "odgovorno tijelo" msgid "didn't use map" msgstr "nije korištena karta" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "npr. ‘%s’ ili‘%s’" @@ -4801,22 +5016,23 @@ msgstr "" msgid "less than a minute" msgstr "manje od minute" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "" @@ -4857,7 +5073,7 @@ msgstr "nema oznake jer korisnik nije označio problem na karti" msgid "this location" msgstr "Prikaz lokacije" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "ovaj tip " @@ -4865,11 +5081,11 @@ msgstr "ovaj tip " msgid "today" msgstr "danas" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4877,14 +5093,24 @@ msgstr "" msgid "used map" msgstr "korištena karta" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "Korisnik je iz istog područja kao i problem - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "korisnik je vlasnik problema" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "E-mail je već na listi zloupotrebe" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "E-mail dodan na listu zloupotrebe" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4954,7 +5180,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -4962,7 +5188,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" @@ -4970,7 +5196,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" @@ -4978,7 +5204,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -4986,7 +5212,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5066,6 +5292,33 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Potvrđene prijave između %s i %s" + +#~ msgid "Hide old" +#~ msgstr "Sakrij staro" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Uključi nepotvrđene prijave" + +#~ msgid "Invalid end date" +#~ msgstr "Nevažeći datum završetka" + +#~ msgid "Invalid start date" +#~ msgstr "Nevažeći datum početka" + +#~ msgid "No council" +#~ msgstr "Nema odgovornog tijela" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Imajte na umu da kada uključujemo nepotvrđene prijave koristimo datum kada je prijava napravljena koji ne mora biti u istom mjesecu kada je prijava potvrđena pa stoga datumi mogu varirati" + +#~ msgid "Show old" +#~ msgstr "Prikaži staro" + +#~ msgid "Year" +#~ msgstr "Godina" + #~ msgid "-- Pick a property type --" #~ msgstr "-- Izaberite vrstu posjeda --" diff --git a/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po index c3506fc2177..86a352173aa 100644 --- a/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/id_ID.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Gengo Projects Team , 2017\n" "Language-Team: Indonesian (Indonesia) (https://www.transifex.com/mysociety/teams/12067/id_ID/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "dan" @@ -32,6 +32,10 @@ msgstr "dan" msgid " or " msgstr "atau" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d suntingan oleh %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s kontak dewan – %s dikonfirmasi, %s belum dikonfirmasi" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -75,7 +79,7 @@ msgstr "" "masalah dalam jarak tertentu dari suatu lokasi." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -89,6 +93,11 @@ msgstr "" msgid "%s live updates" msgstr "%s pembaruan langsung" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s kuesioner dikirim – %s dijawab (%s%%)" @@ -97,7 +106,7 @@ msgstr "%s kuesioner dikirim – %s dijawab (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "Kontributor © OpenStreetMap" @@ -105,11 +114,6 @@ msgstr "Kontributor © Op msgid "(Defect & location of defect)" msgstr "(Kerusakan& lokasi kerusakan)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Surel di tabel penyalahgunaan)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -145,7 +149,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(seperti grafiti, pembuangan ilegal, pelat beton rusak, atau lampu jalan)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "(tidak ada lagi)" @@ -167,8 +171,8 @@ msgstr "(dikirim ke dua-duanya)" msgid "(we also have RSS feeds for problems within %s)" msgstr "Umpan RSS dari masalah dalam %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Pilih kategori --" @@ -181,14 +185,6 @@ msgstr "--Pilih template--" msgid "10 inch pothole on Example St, near post box" msgstr "Lubang jalan sebesar 10 inci di Jalan Contoh, dekat kotak pos" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "14-30 hari lamanya" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "7-14 hari lamanya" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -200,17 +196,17 @@ msgstr "" " Mungkin ini sebabnya \"area cakupan\" kosong (di bawah).
\n" " Mungkin Anda dapat menambahkan MAPIT_TYPES ke berkas konfigurasi?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "%s disimpan." @@ -219,33 +215,52 @@ msgstr "%s disimpan." msgid "%s live problems" msgstr "%s masalah yang sedang berlangsung" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Tidak Biarkan saya mengonfirmasikan laporan saya melalui surel" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Tidak Biarkan saya mengonfirmasikan laporan saya melalui surel" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Tidak Biarkan saya mengonfirmasikan pembaruan saya melalui surel" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Tidak Biarkan saya mengonfirmasikan pembaruan saya melalui surel" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Tidak biarkan saya masuk dengan surel" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Tidak biarkan saya masuk dengan surel" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 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." -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Ya Saya punya kata sandi" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -262,11 +277,17 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Tambahkan badan" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Blokir alamat surel" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -289,11 +310,17 @@ msgstr "Tambahkan kategori baru" msgid "Add option" msgstr "opsional" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Tidak ada nomor telepon)" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "Tambahkan ke daftar pendek" @@ -303,23 +330,23 @@ msgstr "Tambahkan ke daftar pendek" msgid "Add user" msgstr "Tambahkan pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "Tambah/sunting kategori masalah" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "Tambah/sunting prioritas tanggapan" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "Tambah/sunting template tanggapan" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "%s ditambahkan" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 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." @@ -343,9 +370,10 @@ msgstr "Peringatan %d dinonaktifkan (dibuat %s)" msgid "Alert me to future updates" msgstr "Beri tahu saya tentang pembaruan mendatang" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "Semua" @@ -354,12 +382,13 @@ msgstr "Semua" msgid "All Reports" msgstr "Semua Laporan" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Semua Laporan sebagai CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Semua kategori" @@ -375,17 +404,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Semua laporan" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Semua laporan di antara %sdan %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "Sepanjang waktu" @@ -423,7 +452,8 @@ 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:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Apakah Anda yakin?" @@ -434,7 +464,7 @@ msgstr "Apakah Anda yakin?" msgid "Area covered" msgstr "Area cakupan" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "Area:" @@ -448,7 +478,7 @@ msgid "Assign to competent body:" msgstr "Tetapkan ke badan kompeten:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Tetapkan ke kategori lain:" @@ -460,7 +490,7 @@ msgstr "Tetapkan ke badan eksternal:" msgid "Assign to subdivision:" msgstr "Tetapkan ke subdivisi:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "Tetapkan pengguna pada area" @@ -476,12 +506,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 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." -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Tanggapan otomatis:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "Tanggapan otomatis:" @@ -489,18 +524,10 @@ msgstr "Tanggapan otomatis:" msgid "Available categories" msgstr "Kategori yang tersedia" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "Waktu rata-rata antara pelaporan masalah dan penyelesaian masalah, 100 laporan terakhir." -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "Waktu rata-rata dewan menandai masalah diatasi (hari)" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "Waktu rata-rata perubahan wilayah pertama oleh dewan (hari)" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "Hindari informasi pribadi dan pelat nomor kendaraan" @@ -514,20 +541,21 @@ msgstr "Menunggu moderasi" msgid "Back" msgstr "Kembali" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "Kembali ke semua laporan" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Blokir alamat surel" +#, fuzzy +msgid "Ban user" +msgstr "Tandai pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Badan" @@ -538,14 +566,10 @@ msgstr "Badan" msgid "Body" msgstr "Badan" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Badan:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Berdasarkan Tanggal" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -558,8 +582,9 @@ 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:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Kategori" @@ -570,30 +595,36 @@ msgstr "Kategori:" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategori" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategori diubah dari ‘%s’ menjadi ‘%s’" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -601,17 +632,18 @@ msgstr "Tingkat perbaikan kategori untuk masalah > 4 minggu lamanya" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategori: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "Ubah surel" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "Ubah alamat surel" @@ -619,10 +651,16 @@ msgstr "Ubah alamat surel" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Ubah kata sandi" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Tidak ada nomor telepon)" + #: templates/web/base/admin/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." @@ -653,19 +691,14 @@ 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "Pilih lainnya" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "Hapus data offline" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Klik di sini atau masukkan dalam format dd/mm/yyyy" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klik peta untuk melaporkan masalah" @@ -694,18 +727,19 @@ msgstr "Klik tautan pada surel konfirmasi kami untuk masuk." #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Ditutup" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Ditutup oleh dewan" @@ -720,16 +754,17 @@ msgid "Cobrand" msgstr "Cobrand" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Data cobrand:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -737,7 +772,7 @@ msgstr "" msgid "Collapse map" msgstr "Ciutkan peta" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurasi" @@ -746,7 +781,7 @@ msgstr "Konfigurasi" msgid "Confirm" msgstr "Konfirmasikan" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Konfirmasikan akun" @@ -765,14 +800,10 @@ msgstr "Konfirmasi" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Dikonfirmasi" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Laporan yang dikonfirmasi antara %s dan %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -799,8 +830,8 @@ msgstr "Hubungi tim" msgid "Coordinates:" msgstr "Koordinat:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Tidak dapat menemukan pengguna" @@ -818,43 +849,16 @@ msgstr "Dewan" msgid "Council contacts for %s" msgstr "Kontak dewan untuk %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "Dewan telah menandainya ditutup" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "Dewan telah menandainya diatasi" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "Dewan telah menandainya dalam proses" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "Dewan telah menandainya dalam investigasi" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "Dewan telah menandainya direncanakan" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "Referensi dewan: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Dewan:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Jumlah" @@ -876,40 +880,45 @@ msgstr "Buat kategori" msgid "Create priority" msgstr "Buat prioritas" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "Buat laporan/pembaruan mewakili pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "Buat laporan/pembaruan sebagai dewan" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "Buat laporan/pembaruan mewakili pengguna" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Buat template" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Dibuat" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Dibuat:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Wilayah saat ini" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -920,14 +929,14 @@ msgstr "Saat ini belum ada badan dibuat." msgid "Customer not contactable" msgstr "Pelanggan tidak dapat dihubungi" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Dasbor" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Diatasi oleh subdivisi dalam 5 hari kerja" @@ -940,12 +949,12 @@ msgstr "" msgid "Default priority" msgstr "Buat prioritas" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "Tipe kerusakan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Hapus template" @@ -956,8 +965,8 @@ msgstr "Hapus template" msgid "Deleted" msgstr "Dihapus" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "Jelaskan mengapa Anda memoderasi ini" @@ -973,6 +982,10 @@ msgstr "Deskripsi" msgid "Description:" msgstr "Deskripsi:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -985,6 +998,10 @@ msgstr "Detail" msgid "Details:" msgstr "Detail:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Dilimpahkan" @@ -998,8 +1015,8 @@ msgstr "Tidak menggunakan peta" msgid "Diligency prize league table" msgstr "Tabel liga kerajinan" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "Buang perubahan" @@ -1008,7 +1025,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Jangan kirimkan surel peringatan atas komentar yang diambil ke pembuat masalah" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1016,7 +1033,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:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "Apakah Anda ingin melaporkan kerusakan secara otomatis?" @@ -1036,11 +1053,11 @@ msgstr "Turun satu tingkat" 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:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "Duplikat dari" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "Duplikat" @@ -1063,9 +1080,10 @@ msgstr "Ketimuran/Keutaraan:" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Sunting" @@ -1075,33 +1093,33 @@ msgstr "Sunting" msgid "Edit body details" msgstr "Sunting detail badan" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "Sunting detail pengguna lain" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "Sunting perizinan pengguna lain" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "Sunting kategori laporan" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "Sunting prioritas laporan" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "Sunting laporan" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Menyunting masalah %d" @@ -1122,7 +1140,6 @@ msgstr "Penyunting" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1130,17 +1147,20 @@ msgstr "Penyunting" msgid "Email" msgstr "Surel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Surel ditambahkan ke daftar penyalahgunaan" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "Alamat surel" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Alamat surel" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Surel peringatan dibuat" @@ -1149,19 +1169,18 @@ msgstr "Surel peringatan dibuat" msgid "Email alert deleted" msgstr "Surel peringatan dihapus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Surel sudah ada di daftar penyalahgunaan" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Surel:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Surel: %s" @@ -1178,8 +1197,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/body-form.html:123 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" @@ -1189,8 +1208,9 @@ 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Tanggal Akhir:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1211,14 +1231,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Masukkan kode pos, atau nama jalan dan kawasan di sekitar" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Masukkan nama jalan dan kawasan di sekitar" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Masukkan kata sandi" @@ -1236,8 +1256,8 @@ msgstr "Masukkan detail masalah" msgid "Error" msgstr "Galat" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Semuanya" @@ -1262,7 +1282,7 @@ msgstr "Perluas peta" msgid "Explain what’s wrong" msgstr "Jelaskan apa yang salah" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "Ekspor sebagai CSV" @@ -1278,7 +1298,7 @@ msgstr "Eksternal" msgid "External ID" msgstr "ID eksternal" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "URL eksternal" @@ -1290,7 +1310,7 @@ msgstr "Badan eksternal" msgid "External team" msgstr "Tim eksternal" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1302,7 +1322,7 @@ msgstr "Detail tambahan:" msgid "Extra data:" msgstr "Data tambahan:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "Detail tambahan:" @@ -1332,21 +1352,22 @@ msgstr "Atasi ini dengan memilih sebuah area cakupan pada formu #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Diatasi" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Diatasi - Dewan" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Diatasi - Pengguna" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Tandai dihapus" @@ -1354,7 +1375,7 @@ msgstr "Tandai dihapus" msgid "Flag user" msgstr "Tandai pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Ditandai" @@ -1363,7 +1384,7 @@ msgstr "Ditandai" msgid "Flagged reports and users" msgstr "Laporan dan pengguna ditandai" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Pengguna yang ditandai ditampilkan pada halaman ditandai." @@ -1371,8 +1392,8 @@ msgstr "Pengguna yang ditandai ditampilkan pada halaman ditandaiHow FixMyStreet uses Mapit." msgstr "Untuk informasi lebih lanjut, lihat Bagaimana FixMyStreet menggunakan Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1412,9 +1433,13 @@ msgstr "Meneruskan permohonan ke badan eksternal" msgid "Frequently Asked Questions" msgstr "Tanya Jawab Umum" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" -msgstr "Dapatkan Jumlah" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" +msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 @@ -1446,12 +1471,12 @@ msgstr "Senang mengetahui masalah telah diatasi!" #: 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Mulai" @@ -1459,7 +1484,7 @@ msgstr "Mulai" msgid "Going to send questionnaire?" msgstr "Akan mengirim kuesioner?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "Berikan izin akses untuk admin" @@ -1467,6 +1492,15 @@ 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/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "oleh %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Sudahkah masalah ini diatasi?" @@ -1487,21 +1521,26 @@ msgstr "Bantuan" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "Bantu %s mengatasi masalah Anda lebih cepat, dengan memberikan sejumlah detail tambahan. Informasi tambahan ini tidak akan diterbitkan secara online." +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Foto dari laporan baru-baru ini di sekitar" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hai %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Tersembunyi" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "Sembunyikan seluruh laporan" @@ -1522,21 +1561,18 @@ 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:67 -msgid "Hide old" -msgstr "Sembunyikan yang lama" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Sembunyikan pin" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "Sembunyikan seluruh pembaruan?" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "Sembunyikan nama Anda?" @@ -1548,7 +1584,7 @@ msgstr "" msgid "History" msgstr "Riwayat" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Beranda" @@ -1607,6 +1643,10 @@ msgstr "Jika prioritas ini diteruskan ke layanan eksternal (mis. Exor/Confirm) m msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1615,6 +1655,10 @@ 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 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." @@ -1623,7 +1667,7 @@ msgstr "Jika Anda mendapatkan informasi mengenai status masalah Anda, mohon kemb 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." -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Jika Anda hanya ingin template ini menjadi opsi untuk kategori tertentu, pilih kategorinya di sini. Secara default, template akan ditampilkan untuk semua kategori." @@ -1632,7 +1676,7 @@ msgstr "Jika Anda hanya ingin template ini menjadi opsi untuk kategori tertentu, msgid "If you submit a problem here the problem will not be reported to the council." msgstr "Jika Anda memasukkan masalah di sini, masalah tersebut tidak akan dilaporkan kepada dewan." -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "Jika Anda ingin menggunakan template ini sebagai isian default pada kolom pembaruan saat mengubah wilayah laporan, pilih wilayah di sini." @@ -1714,11 +1758,7 @@ msgstr "Kotak masuk kosong, tunggulah kami!" msgid "Include reporter personal details" msgstr "Sertakan detail pribadi pelapor" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Sertakan laporan yang belum dikonfirmasi" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Nilai has_photo keliru \"%s\"" @@ -1730,7 +1770,7 @@ msgstr "Inspeksi laporan" msgid "Inspection required" msgstr "Diperlukan inspeksi" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "Instruksikan kontraktor untuk mengatasi masalah" @@ -1742,26 +1782,18 @@ msgstr "Catatan internal" msgid "Internet glitch" msgstr "Kesalahan sistem pada internet" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Nilai agency_responsible keliru %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Tanggal akhir keliru" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Format %s yang disebutkan keliru." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "Lokasi keliru. Lokasi baru harus dicakup oleh dewan yang sama." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Tanggal mulai keliru" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "Biasanya, cara yang tercepat adalah dengan memeriksa TJU kami dan mencari tahu apakah jawabannya ada di sana." @@ -1780,7 +1812,7 @@ msgstr "Yurisdiksi Tidak Diketahui" msgid "Jurisdiction unknown" msgstr "Yurisdiksi tidak diketahui" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1805,12 +1837,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "4 minggu terakhir" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "7 hari terakhir" @@ -1836,18 +1863,14 @@ msgstr "Pembaruan terakhir:" msgid "Latitude/Longitude:" msgstr "Lintang/Bujur:" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "Terlama dari yang baru-baru ini diperbarui" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "Kurang dari 7 hari lamanya" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1856,13 +1879,13 @@ msgstr "" msgid "List all reported problems" msgstr "Tampilkan semua masalah yang dilaporkan" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Memuat..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1894,12 +1917,16 @@ msgstr "Masuk dengan Facebook" msgid "Log in with Twitter" msgstr "Masuk dengan Twitter" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "Masuk dengan surel" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +#, fuzzy +msgid "Log in with email/text" +msgstr "Masuk dengan surel" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "Cari" @@ -1907,11 +1934,11 @@ msgstr "Cari" msgid "MAP" msgstr "PETA" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "Kelola daftar pendek" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "Permintaan manual" @@ -1923,11 +1950,11 @@ msgstr "Peta" msgid "Mark as sent" msgstr "Tandai sebagai dikirim" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 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:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "Detail masalah penggelembungan" @@ -1947,45 +1974,45 @@ msgstr "Kirim pesan ke badan eksternal:" msgid "Missing bodies:" msgstr "Badan tidak ditemukan:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "jurisdiction_id tidak ditemukan" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "Moderasi" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "Detail laporan moderasi" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "Moderasi laporan ini" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "Moderasi pembaruan ini" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "Dimoderasi oleh %s pada %s" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Dimoderasi oleh divisi dalam satu hari kerja" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "Alasan moderasi:" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Bulan" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "Komentar terbanyak" @@ -2003,9 +2030,9 @@ msgstr "Komentar terbanyak" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2016,19 +2043,24 @@ msgstr "Nama" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Nama:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Nama: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "Beralih ke masalah ini" +#: templates/web/base/report/_inspect.html:39 +#, fuzzy +msgid "Nearest calculated address:" +msgstr "Alamat surel baru:" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2038,12 +2070,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2059,20 +2091,25 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "Hampir selesai! Sekarang, periksa surel Anda…" +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "Hampir selesai! Sekarang, periksa surel Anda…" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 #, fuzzy msgid "New" msgstr "Terbaru" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Badan baru ditambahkan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Kontak kategori baru ditambahkan" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "Alamat surel baru:" @@ -2093,6 +2130,11 @@ msgstr "Catatan baru untuk DM:" msgid "New password:" msgstr "Kata sandi baru:" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Tidak ada nomor telepon)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2122,18 +2164,19 @@ msgstr "Masalah baru dalam cakupan {{NAME}} di FixMyStreet" msgid "New reports" msgstr "Laporan baru" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Wilayah baru" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Template baru" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "Terbaru" @@ -2141,7 +2184,7 @@ msgstr "Terbaru" msgid "Next" msgstr "Selanjutnya" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2153,22 +2196,18 @@ msgstr "Selanjutnya" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Tidak" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Tidak ada area" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Tidak ada badan" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Tidak ada dewan" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Tidak ada dewan dipilih" @@ -2198,6 +2237,10 @@ msgstr "Tidak dilakukan inspeksi oleh inspektor pada kisaran tanggal yang dipili msgid "No inspections in the selected date range." msgstr "Tidak dilakukan inspeksi pada kisaran tanggal yang dipilih." +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Tidak ada hasil dikembalikan" @@ -2222,8 +2265,8 @@ msgstr "Tidak ada pendukung" msgid "None" msgstr "Tidak Ada" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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." @@ -2231,8 +2274,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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2255,7 +2298,7 @@ msgstr "Tidak dapat dihubungi" msgid "Not for my subdivision" msgstr "Bukan untuk subdivisi saya" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Tidak dilaporkan sebelumnya" @@ -2269,10 +2312,6 @@ msgstr "Tidak dilaporkan ke dewan" msgid "Note" msgstr "Catatan" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Perhatikan bahwa saat menyertakan laporan yang belum dikonfirmasi, kami menggunakan tanggal laporan dibuat, yang mungkin bukan di bulan yang sama dengan waktu laporan dikonfirmasi, sehingga angkanya mungkin sedikit berbeda" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2300,37 +2339,47 @@ msgstr "Sekarang saatnya memasukkan laporan Anda…" msgid "Now to submit your update…" msgstr "Sekarang untuk memasukkan pembaruan Anda…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "Jumlah masalah yang dilaporkan di setiap kategori, selama 7 hari terakhir." +#: templates/web/base/reports/index.html:99 +#, fuzzy +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "Jumlah masalah yang dilaporkan di setiap kategori, selama 7 hari terakhir." + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "Oke" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "Data offline dihapus" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "Data pembaruan offline disimpan" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Wilayah lama" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "Terlama" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2370,23 +2419,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Lainnya" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "Kategori lainnya" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "area lainnya:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "Rata-rata keseluruhan" @@ -2404,19 +2460,19 @@ msgstr "Halaman Tidak Ditemukan" msgid "Parent" msgstr "Induk" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Parsial" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Kata sandi (opsional)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Kata sandi:" @@ -2424,7 +2480,7 @@ msgstr "Kata sandi:" msgid "Permalink" msgstr "Permalink:" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "Perizinan:" @@ -2433,19 +2489,25 @@ msgstr "Perizinan:" msgid "Phone Reporter:" msgstr "Dilaporkan:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Nomor telepon" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Nomor telepon (opsional)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Dilaporkan:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telepon:" @@ -2461,7 +2523,7 @@ msgstr "Telepon:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2487,12 +2549,18 @@ msgstr "Foto" msgid "Photos of recent nearby reports" msgstr "Foto dari laporan baru-baru ini di sekitar" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "Pilih dewan Anda" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +#, fuzzy +msgid "Pick your ward" +msgstr "Pilih dewan Anda" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Pasang pin di peta" @@ -2514,25 +2582,34 @@ msgstr "Mohon untuk sopan, singkat, dan langsung ke intinya." msgid "Please check the passwords and try again" msgstr "Silakan periksa kata sandi dan coba lagi" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Silakan periksa apakah alamat surel Anda benar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Silakan periksa apakah alamat surel Anda benar" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Silakan pilih kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Mohon koreksi kesalahan-kesalahan di bawah ini" @@ -2550,39 +2627,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Silakan masukkan pesan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Silakan masukkan nomor telepon Anda" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "Silakan masukkan nama baru" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "Silakan masukkan nama untuk badan ini" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Silakan masukkan kata sandi" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Silakan masukkan subjek" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Silakan masukkan surel yang valid" @@ -2591,55 +2676,62 @@ msgstr "Silakan masukkan surel yang valid" msgid "Please enter a valid email address" msgstr "Silakan masukkan alamat surel yang valid" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Silakan masukkan nomor telepon Anda" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Silakan masukkan detail" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Silakan masukkan surel Anda" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Silakan masukkan alamat surel Anda" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Silakan masukkan nama depan Anda" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Silakan masukkan nama Anda" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Silakan masukkan nomor telepon Anda" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Silakan masukkan nama kedua Anda" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Silakan masukkan sapaan Anda" @@ -2688,7 +2780,12 @@ msgstr "Harap perhatikan bahwa pembaruan Anda belum terkirim." msgid "Please note:" msgstr "Harap perhatikan:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Mohon berikan pembaruan publik untuk laporan ini." + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "Mohon berikan pembaruan publik untuk laporan ini." @@ -2728,6 +2825,11 @@ msgstr "Mohon beri tahu apakah masalah telah diatasi atau belum" msgid "Please upload an image only" msgstr "Mohon untuk hanya mengunggah gambar" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Silakan tuliskan pesan" @@ -2737,7 +2839,7 @@ msgid "Please write your update here" msgstr "Silakan tuliskan pembaruan Anda di sini" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Kirim" @@ -2746,15 +2848,15 @@ msgstr "Kirim" msgid "Posted anonymously at %s" msgstr "Dikirim secara anonim pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Dikirim oleh %s pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Dikirim oleh %s (%s) pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Dikirim oleh %s pada %s" @@ -2766,11 +2868,11 @@ msgstr "Didukung oleh kunci API untuk menunjukkan bahwa laporan\n" " dikirim dari instalasi FixMyStreet Anda." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Beberapa foto dari laporan terbaru" @@ -3532,15 +3647,20 @@ msgstr "Sejumlah teks untuk dilokalisasikan" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "Maaf, itu bukan tautan yang valid" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "Maaf, itu bukan tautan yang valid" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3575,20 +3695,21 @@ 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:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "Sortir berdasarkan" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 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:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "Staf:" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Tanggal Mulai:" #: templates/web/base/admin/body.html:73 @@ -3598,15 +3719,18 @@ msgstr "Tanggal Mulai:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Wilayah" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Simpan perubahan" @@ -3620,17 +3744,19 @@ msgstr "Simpan perubahan" msgid "State:" msgstr "Wilayah:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Wilayah" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistik" @@ -3640,7 +3766,7 @@ msgstr "Statistik" msgid "Status" msgstr "Status" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Masih terbuka, melalui kuesioner, %s" @@ -3653,7 +3779,12 @@ msgstr "Tampilan Jalan" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Subkategori: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Subkategori: %s" @@ -3670,18 +3801,19 @@ msgstr "Subjek" msgid "Subject:" msgstr "Subjek:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Masukkan" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3723,7 +3855,7 @@ msgstr "Buat ringkasan masalah" msgid "Summarise your changes" msgstr "Buat ringkasan tentang perubahan Anda" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3731,25 +3863,31 @@ msgstr "Buat ringkasan tentang perubahan Anda" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Ringkasan" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Laporan ringkasan" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Laporan ringkasan" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "Pengguna Super:" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "Pengguna Super memiliki izin untuk melakukan semua tindakan sebagai admin." -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Hasil Survei" @@ -3757,14 +3895,14 @@ msgstr "Hasil Survei" msgid "Template «%s»" msgstr "Template «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Template" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Teks" @@ -3772,7 +3910,7 @@ msgstr "Teks" msgid "Text only version" msgstr "Versi teks saja" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3799,7 +3937,7 @@ msgstr "Terima kasih atas pertanyaan Anda" msgid "Thank you for your feedback" msgstr "Terima kasih atas umpan balik Anda" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Terima kasih telah mengunggah foto Anda. Sekarang kami perlu melacak masalah Anda, oleh karena itu mohon masukkan nama jalan terdekat atau kode pos pada kotak di atas :" @@ -3815,7 +3953,7 @@ msgstr "Gambar tersebut tampaknya tidak terunggah dengan benar (%s), silakan cob 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Lokasi tersebut tampaknya bukan di UK; silakan coba lagi." @@ -3825,11 +3963,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Masalah tersebut telah ditandai sebagai terkirim." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Masalah tersebut sekarang akan dikirim ulang." @@ -3867,8 +4005,8 @@ 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3905,8 +4043,8 @@ msgstr "Dewan tidak akan dapat membantu kecuali Anda menyediakan sebanyak mungki 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:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Kesalahannya adalah: %s" @@ -3948,7 +4086,7 @@ msgstr "Masalah terbaru yang dilaporkan telah diatasi oleh pengguna" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Masalah terbaru dalam cakupan {{NAME}} yang dilaporkan oleh pengguna" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 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." @@ -3973,7 +4111,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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" @@ -3986,33 +4124,38 @@ msgstr "" "Nama pengguna ditampilkan ke publik pada laporan yang tidak ditandai anonim.\n" " Nama tidak harus unik." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Tidak ada laporan untuk ditampilkan." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "Terdapat masalah saat menampilkan halaman ini. Silakan coba lagi nanti." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Terdapat masalah dengan kombinasi surel/kata sandi Anda. Jika Anda tidak dapat mengingat kata sandi Anda, atau Anda tidak memilikinya, silakan isi formulir pada bagian ‘masuk dengan surel’." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Terdapat masalah dengan kombinasi surel/kata sandi Anda. Silakan coba lagi." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Terdapat masalah dengan kombinasi surel/kata sandi Anda. Jika Anda tidak dapat mengingat kata sandi Anda, atau Anda tidak memilikinya, silakan isi formulir pada bagian ‘masuk dengan surel’." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Terdapat masalah dengan pembaruan Anda. Silakan coba lagi." @@ -4020,7 +4163,7 @@ msgstr "Terdapat masalah dengan pembaruan Anda. Silakan coba lagi." msgid "There were problems with your report. Please see below." msgstr "Terdapat masalah dengan laporan Anda. Silakan lihat di bawah ini." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Terdapat masalah dengan pembaruan Anda. Silakan lihat di bawah ini." @@ -4085,26 +4228,34 @@ 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:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Informasi ini diperlukan" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Ini adalah situs pengembang; kesalahan mungkin terjadi kapan saja, dan basis data akan dihapus secara berkala." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "Lubang jalan ini sudah berada di sini selama dua bulan dan..." @@ -4121,7 +4272,7 @@ msgstr "Masalah ini belum diatasi" msgid "This problem is still ongoing" msgstr "Masalah ini masih berlangsung" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: 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:" @@ -4131,23 +4282,23 @@ msgstr "Laporan ini adalah duplikat. Silakan tambahkan pembaruan pada laporan as msgid "This report is awaiting moderation." msgstr "Laporan ini menunggu moderasi." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Laporan ini saat ini ditandai sebagai ditutup." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Laporan ini saat ini ditandai sebagai diatasi." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Laporan ini saat ini ditandai sebagai terbuka." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Laporan ini dikirim secara anonim." -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4158,7 +4309,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Kronologi" @@ -4170,20 +4321,21 @@ msgstr "Kiat untuk foto yang sempurna" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Judul" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Judul:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "Untuk mencari tahu peringatan lokal apa saja yang tersedia untuk Anda, silakan masukkan %s kode pos atau nama jalan dan kawasan Anda:" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Untuk mencari tahu peringatan lokal apa saja yang tersedia untuk Anda, silakan masukkan kode pos atau nama jalan dan kawasan Anda" @@ -4195,44 +4347,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "Untuk melihat peta dari lokasi tepat dari masalah ini" -#: templates/web/base/reports/index.html:97 +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" +msgstr "" + +#: templates/web/base/reports/index.html:126 msgid "Top 5 most used categories" msgstr "5 kategori yang paling banyak digunakan" -#: templates/web/base/reports/index.html:83 +#: templates/web/base/reports/index.html:111 msgid "Top 5 responsive councils" msgstr "5 dewan yang paling responsif" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" +msgstr "" + +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 msgid "Total" msgstr "Total" -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" -msgstr "Total ditandai" - -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" -msgstr "Total ditandai sebagai diatasi" - -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" -msgstr "Total tidak ditandai" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "Total laporan diterima" - -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "Perlu manajemen lalu lintas?" @@ -4245,18 +4389,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "Dipercaya oleh badan:" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 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:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "Dipercaya:" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Coba lagi" @@ -4271,7 +4416,11 @@ msgstr "Cobalah mengirimkan surel langsung kepada kami:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4280,15 +4429,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Belum dikonfirmasi" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "Laporan yang belum diatasi" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Tidak diketahui" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Tipe peringatan tidak diketahui" @@ -4298,13 +4443,14 @@ msgstr "Tipe peringatan tidak diketahui" msgid "Unknown error" msgstr "Kesalahan tidak diketahui" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "ID masalah tidak diketahui" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "Dihapus dari daftar pendek" @@ -4329,12 +4475,12 @@ msgstr "Pembaruan di bawah ini ditambahkan secara anonim pada %s" 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Perbarui badan" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Perincian pembaruan berdasarkan wilayah" @@ -4342,16 +4488,16 @@ msgstr "Perincian pembaruan berdasarkan wilayah" msgid "Update by {{name}}" msgstr "Pembaruan berdasarkan {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Pembaruan mengubah wilayah masalah menjadi %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Pembaruan menandai masalah sebagai diatasi" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Pembaruan membuka kembali masalah" @@ -4365,20 +4511,20 @@ msgstr "Perbarui status" msgid "Updated" msgstr "Diperbarui" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Dikirim oleh %s (%s) pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Dikirim oleh %s pada %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4386,7 +4532,7 @@ msgid "Updated!" msgstr "Diperbarui!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Pembaruan" @@ -4439,40 +4585,81 @@ msgstr "Peta digunakan" msgid "User ID to attribute fetched comments to" msgstr "ID Pengguna untuk dikaitkan dengan komentar yang diambil" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Surel ditambahkan ke daftar penyalahgunaan" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Surel sudah ada di daftar penyalahgunaan" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Tanda pada pengguna dihapus" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Pengguna ditandai" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "Pengguna telah ditandai sebagai diatasi" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "Pada tabel penyalahgunaan?" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Pencarian pengguna menemukan kecocokan pada nama pengguna dan alamat surel." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Pengguna" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Pengguna" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 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:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Nilai diperbarui" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Alamat surel baru:" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Nomor telepon Anda" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4494,12 +4681,7 @@ msgstr "Menampilkan lokasi" msgid "Viewing a problem" msgstr "Menampilkan masalah" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "WTD" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "Kelurahan:" @@ -4509,20 +4691,25 @@ msgstr "Kelurahan di dewan ini" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Kami menemukan lebih dari satu hasil yang cocok untuk lokasi tersebut. Kami menampilkan sampai 10 hasil yang cocok, silakan coba pencarian yang berbeda jika apa yang Anda cari tidak ditampilkan di sini." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Kami menemukan lebih dari satu hasil yang cocok untuk referensi masalah tersebut:" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "Kami menemukan lebih dari satu hasil yang cocok untuk referensi masalah tersebut:" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 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:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4530,6 +4717,12 @@ msgstr "Kami menyadari bahwa masalah ini mungkin merupakan tanggung jawab%s; mes msgid "We send it to the council on your behalf" msgstr "Kami telah mengirimkannya kepada dewan untuk mewakili Anda" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Kami menemukan lebih dari satu hasil yang cocok untuk lokasi tersebut. Kami menampilkan sampai 10 hasil yang cocok, silakan coba pencarian yang berbeda jika apa yang Anda cari tidak ditampilkan di sini." + #: 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." @@ -4539,9 +4732,9 @@ msgstr "Kami hanya akan menggunakan informasi pribadi Anda sesuai dengan MaPit." msgstr "Dengan pencarian permintaan, Anda juga dapat mencari agency_responsible untuk membatasi permintaan pada yang dikirimkan ke satu administrasi. Kata kunci pencarian adalah ID administrasi yang disediakan oleh MapIt." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "Inginkah Anda berkontribusi di FixMyStreet? Kode kami adalah sumber terbuka dan tersedia di fixmystreet.org." @@ -4607,16 +4804,7 @@ msgstr "Menuliskan pesan Anda seluruhnya dalam huruf kapital membuatnya sulit di msgid "Wrong location? Just click again on the map." msgstr "Lokasi salah? Cukup klik lagi di peta." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "YTD" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Tahun" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4631,7 +4819,7 @@ msgstr "Tahun" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Ya" @@ -4644,7 +4832,7 @@ msgstr "Ya, saya punya kata sandi" 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:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "Anda sedang offline" @@ -4661,7 +4849,7 @@ msgstr "Anda melaporkan pembaruan berikut ini karena menggunakan kata-kata kasar msgid "You can view the problem on this site." msgstr "Anda dapat menampilkan masalah di situs ini." -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 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." @@ -4690,7 +4878,7 @@ 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:93 +#: templates/web/base/admin/body-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." @@ -4698,7 +4886,7 @@ msgstr "Anda dapat menandai sebuah badan sebagai dihapus jika Anda tidak ingin b msgid "You declined; please fill in the box above" msgstr "Anda menolak; mohon isi kotak di atas" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "Anda punya %s yang disimpan untuk dikirim." @@ -4725,18 +4913,38 @@ msgstr "Anda sudah keluar dari akun" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Anda telah melacak masalah pada titik yang ditandai dengan pin berwarna hijau di peta. Jika ini bukan lokasi yang tepat, cukup klik pada peta lagi." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Anda telah berhasil mengonfirmasikan alamat surel Anda." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Anda telah berhasil mengonfirmasikan alamat surel Anda." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Anda telah berhasil mengonfirmasikan alamat surel Anda." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Anda telah berhasil mengonfirmasikan alamat surel Anda." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Anda telah berhasil masuk; silakan periksa dan konfirmasikan bahwa detail Anda sudah benar:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Anda telah berhasil mengonfirmasikan alamat surel Anda." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Anda belum membuat satu pun laporan. Laporkan sebuah masalah sekarang." @@ -4762,36 +4970,43 @@ msgid "Your Reports" msgstr "Laporan Anda" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "Akun Anda" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Surel Anda" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Alamat surel Anda" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Alamat surel Anda" + #: 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" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4802,19 +5017,19 @@ msgstr "Nama Anda" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "Nama Anda sudah dikirim ke %s, tetapi kami dapat menyembunyikannya di halaman ini:" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "Nama Anda telah disembunyikan pada semua laporan dan pembaruan Anda." -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "Nama Anda telah disembunyikan" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "Laporan offline Anda" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4825,8 +5040,8 @@ msgstr "Kata sandi Anda" msgid "Your password has been changed" msgstr "Kata sandi Anda telah diubah" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Nomor telepon Anda" @@ -4835,7 +5050,7 @@ msgstr "Nomor telepon Anda" msgid "Your report" msgstr "Laporan Anda" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Laporan Anda" @@ -4844,25 +5059,40 @@ msgstr "Laporan Anda" msgid "Your shortlist" msgstr "Daftar pendek Anda" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Nama Anda telah disembunyikan" + +#: templates/web/base/js/translation_strings.html:70 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." -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Pembaruan Anda" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "Anda" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "semua" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4879,8 +5109,8 @@ msgstr "dewan" msgid "didn't use map" msgstr "tidak menggunakan peta" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "mis. ‘%s’ atau ‘%s’" @@ -4903,23 +5133,24 @@ msgstr "terakhir diperbarui %s" msgid "less than a minute" msgstr "kurang dari satu menit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "tidak ada" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "ditandai sebagai bukan tanggung jawab dewan" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "atau lacak saya secara otomatis" @@ -4960,7 +5191,7 @@ msgstr "tidak ada pin ditampilkan karena pengguna tidak menggunakan peta" msgid "this location" msgstr "Menampilkan lokasi" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "tipe masalah lokal ini" @@ -4968,11 +5199,11 @@ msgstr "tipe masalah lokal ini" msgid "today" msgstr "hari ini" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "pembaruan" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "pembaruan" @@ -4980,14 +5211,24 @@ msgstr "pembaruan" msgid "used map" msgstr "peta digunakan" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "pengguna dari dewan yang sama dengan masalah - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "pengguna adalah pemilik masalah" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Surel sudah ada di daftar penyalahgunaan" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Hapus dari daftar pendek" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5041,31 +5282,31 @@ msgid "%d year" msgid_plural "%d years" msgstr[0] "%d tahun" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "%s hari" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "%s masalah ditandai sebagai diatasi" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "%s masalah dilaporkan" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "%s laporan" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5125,6 +5366,109 @@ msgid "report" msgid_plural "reports" msgstr[0] "laporan" +#, fuzzy +#~ msgid "Current state of filtered reports" +#~ msgstr "Laporan offline Anda" + +#~ msgid "(Email in abuse table)" +#~ msgstr "(Surel di tabel penyalahgunaan)" + +#~ msgid "14-30 days old" +#~ msgstr "14-30 hari lamanya" + +#~ msgid "7-14 days old" +#~ msgstr "7-14 hari lamanya" + +#~ msgid "Average time to council marking fixed (days)" +#~ msgstr "Waktu rata-rata dewan menandai masalah diatasi (hari)" + +#~ msgid "Average time to first council state change (days)" +#~ msgstr "Waktu rata-rata perubahan wilayah pertama oleh dewan (hari)" + +#~ msgid "By Date" +#~ msgstr "Berdasarkan Tanggal" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Klik di sini atau masukkan dalam format dd/mm/yyyy" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Laporan yang dikonfirmasi antara %s dan %s" + +#~ msgid "Council has marked as closed" +#~ msgstr "Dewan telah menandainya ditutup" + +#~ msgid "Council has marked as fixed" +#~ msgstr "Dewan telah menandainya diatasi" + +#~ msgid "Council has marked as in progress" +#~ msgstr "Dewan telah menandainya dalam proses" + +#~ msgid "Council has marked as investigating" +#~ msgstr "Dewan telah menandainya dalam investigasi" + +#~ msgid "Council has marked as planned" +#~ msgstr "Dewan telah menandainya direncanakan" + +#~ msgid "Get Count" +#~ msgstr "Dapatkan Jumlah" + +#~ msgid "Hide old" +#~ msgstr "Sembunyikan yang lama" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Sertakan laporan yang belum dikonfirmasi" + +#~ msgid "Invalid end date" +#~ msgstr "Tanggal akhir keliru" + +#~ msgid "Invalid start date" +#~ msgstr "Tanggal mulai keliru" + +#~ msgid "Last 4 weeks" +#~ msgstr "4 minggu terakhir" + +#~ msgid "Less than 7 days old" +#~ msgstr "Kurang dari 7 hari lamanya" + +#~ msgid "No council" +#~ msgstr "Tidak ada dewan" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Perhatikan bahwa saat menyertakan laporan yang belum dikonfirmasi, kami menggunakan tanggal laporan dibuat, yang mungkin bukan di bulan yang sama dengan waktu laporan dikonfirmasi, sehingga angkanya mungkin sedikit berbeda" + +#~ msgid "Show old" +#~ msgstr "Tampilkan yang lama" + +#~ msgid "Total marked" +#~ msgstr "Total ditandai" + +#~ msgid "Total marked as fixed" +#~ msgstr "Total ditandai sebagai diatasi" + +#~ msgid "Total not marked" +#~ msgstr "Total tidak ditandai" + +#~ msgid "Total reports received" +#~ msgstr "Total laporan diterima" + +#~ msgid "Unfixed reports" +#~ msgstr "Laporan yang belum diatasi" + +#~ msgid "User has marked as fixed" +#~ msgstr "Pengguna telah ditandai sebagai diatasi" + +#~ msgid "WTD" +#~ msgstr "WTD" + +#~ msgid "Week To Date" +#~ msgstr "Week to Date" + +#~ msgid "YTD" +#~ msgstr "YTD" + +#~ msgid "Year" +#~ msgstr "Tahun" + #~ msgid "" #~ "%s sends different categories of problem\n" #~ "to the appropriate council, so problems within the boundary of a particular council\n" diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po index fb4e537e811..cfc66adaecf 100644 --- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Italian (https://www.transifex.com/mysociety/teams/12067/it/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "e" @@ -32,6 +32,10 @@ msgstr "e" msgid " or " msgstr "o" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d modificato da %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s contatti del Comune – %s confermati, %s non confermati" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s aggiornamenti in tempo reale" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s questionari inviati – %s compilati (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s questionari inviati – %s compilati (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Email nella tabella degli abusi)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(come gli atti vandalici, le discariche abusive, la pavimentazione e l'illuminazione stradale rotta)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -161,8 +165,8 @@ msgstr "(inviato ad entrambi)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS feed dei problemi dentro %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Scegli una categoria --" @@ -175,14 +179,6 @@ msgstr "--Scegli un template--" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -191,16 +187,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -209,33 +205,52 @@ msgstr "" msgid "%s live problems" msgstr "%s problemi in tempo reale" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "No Lasciami confermare la mia segnalazione via email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "No Lasciami confermare la mia segnalazione via email" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "No Lasciami confermare il mio aggiornamento via email" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "No Lasciami confermare il mio aggiornamento via email" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "No lasciami entrare con l'email" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "No lasciami entrare con l'email" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Si Ho già la password" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -249,11 +264,17 @@ msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Aggiungi un corpo" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Vietare l'indirizzo email" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -276,11 +297,17 @@ msgstr "Aggiungi una nuova categoria" msgid "Add option" msgstr "(opzionale)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Nessun recapito)" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -290,23 +317,23 @@ msgstr "" msgid "Add user" msgstr "Aggiungi un'utente" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Aggiunti %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -330,9 +357,10 @@ msgstr "Segnalazione %d disabilitata (creata %s)" msgid "Alert me to future updates" msgstr "Avvisami su futuri aggiornamenti" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -341,12 +369,13 @@ msgstr "" msgid "All Reports" msgstr "Tutte le segnalazioni" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Tutte le categorie" @@ -362,17 +391,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Tutte le segnalazioni" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Tutte le segnalazioni tra %s e %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -410,7 +439,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -421,7 +451,7 @@ msgstr "" msgid "Area covered" msgstr "Area coperta" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -435,7 +465,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Assegna ad una categoria differente:" @@ -447,7 +477,7 @@ msgstr "Assegna ad un corpo esterno:" msgid "Assign to subdivision:" msgstr "Assegna ad una subdivisione:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -463,12 +493,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Non responsabile" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -476,18 +511,10 @@ msgstr "" msgid "Available categories" msgstr "Categorie disponibili" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -501,20 +528,21 @@ msgstr "" msgid "Back" msgstr "Indietro" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Vietare l'indirizzo email" +#, fuzzy +msgid "Ban user" +msgstr "Utente segnalato" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Corpi" @@ -525,14 +553,10 @@ msgstr "Corpi" msgid "Body" msgstr "Corpo" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Corpo:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Per data" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -545,8 +569,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Non puoi vedere la mappa? Salta questo passaggio" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -557,30 +582,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Categoria" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Categoria" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -588,17 +619,17 @@ msgstr "" msgid "Category:" msgstr "Categoria:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Categoria: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -606,10 +637,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Cambia la Password" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Nessun recapito)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -631,19 +668,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Clicca sulla mappa per riportare un problema" @@ -671,18 +703,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Chiuso" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Chiuso dal comune" @@ -697,16 +730,17 @@ msgid "Cobrand" msgstr "Cobrand" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Dati del Cobrand:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -714,7 +748,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configurazione" @@ -723,7 +757,7 @@ msgstr "Configurazione" msgid "Confirm" msgstr "Conferma" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Conferma l'account" @@ -742,14 +776,10 @@ msgstr "Conferma" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Confermato" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "La segnalazione è confermata tra %s e %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -776,8 +806,8 @@ msgstr "Contatta il team" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Non posso trovare l'utente" @@ -795,43 +825,16 @@ msgstr "Comune" msgid "Council contacts for %s" msgstr "I contatti del comune per %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Comune:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Contare" @@ -853,39 +856,44 @@ msgstr "Crea una categoria" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Creato" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Creato:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Stato corrente" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -896,14 +904,14 @@ msgstr "" msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Pannello di controllo" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -915,12 +923,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -931,8 +939,8 @@ msgstr "" msgid "Deleted" msgstr "Eliminato" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -948,6 +956,10 @@ msgstr "Descrizione" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -960,6 +972,10 @@ msgstr "Dettagli" msgid "Details:" msgstr "Dettagli:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Devoluto:" @@ -973,8 +989,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -983,7 +999,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -991,7 +1007,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1011,11 +1027,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1035,9 +1051,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Modifica" @@ -1047,33 +1064,33 @@ msgstr "Modifica" msgid "Edit body details" msgstr "Modifica dettagli corpo" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Modifica problema %d" @@ -1094,7 +1111,6 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1102,17 +1118,20 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Email aggiunta alla lista abusi" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Password (opzionale)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1121,19 +1140,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Email già presente nella lista abusi" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Email: %s" @@ -1146,16 +1164,17 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Data di fine" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1176,14 +1195,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Inserisci il piu vicino codice postale UK o il nome di una strada e l'area" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 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à " -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Inserisci una password" @@ -1201,8 +1220,8 @@ msgstr "Inserisci i dettagli del problema" msgid "Error" msgstr "Errore" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1227,7 +1246,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1243,7 +1262,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1255,7 +1274,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1267,7 +1286,7 @@ msgstr "Dati extra:" msgid "Extra data:" msgstr "Dati extra:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1297,21 +1316,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Risolto" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Risolto - Comune" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Risolto - Utente" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "" @@ -1319,7 +1339,7 @@ msgstr "" msgid "Flag user" msgstr "Utente segnalato" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Segnalato" @@ -1328,7 +1348,7 @@ msgstr "Segnalato" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1336,8 +1356,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Segnalato:" @@ -1357,7 +1377,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1377,8 +1397,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Domande Frequenti" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1411,12 +1435,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Vai" @@ -1424,7 +1448,7 @@ msgstr "Vai" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1432,6 +1456,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "da %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "E' stato risolto questo problema?" @@ -1452,21 +1485,26 @@ msgstr "Aiuto" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Foto delle piu vicine e recenti segnalazioni" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Ciao %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Nascosto" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1487,21 +1525,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1513,7 +1548,7 @@ msgstr "" msgid "History" msgstr "Cronologia" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Home" @@ -1570,12 +1605,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1584,7 +1627,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1593,7 +1636,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1665,11 +1708,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Includi segnalazioni non confermate" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1681,7 +1720,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1693,26 +1732,18 @@ msgstr "" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1731,7 +1762,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1756,12 +1787,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1787,18 +1813,14 @@ msgstr "Ultimo aggiornamento:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1807,13 +1829,13 @@ msgstr "" msgid "List all reported problems" msgstr "Lista di tutti i problemi segnalati" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Caricando..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1845,12 +1867,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1858,11 +1883,11 @@ msgstr "" msgid "MAP" msgstr "MAPPA" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1874,11 +1899,11 @@ msgstr "Mappa" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1898,45 +1923,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Mese" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1954,9 +1979,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1967,19 +1992,23 @@ msgstr "Nome" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Nome:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Nome: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1989,12 +2018,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2008,19 +2037,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Nuovo corpo aggiunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Nuova categoria contatto aggiunta" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2041,6 +2074,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Nessun recapito)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2070,18 +2108,19 @@ msgstr "Nuovi problemi dentro i confini di {{NAME}} su FixMyStreet" msgid "New reports" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Nuovo stato" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2089,7 +2128,7 @@ msgstr "" msgid "Next" msgstr "Prossimo" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2101,22 +2140,18 @@ msgstr "Prossimo" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "No" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Nessun corpo" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Nessuno comune" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Nessun comune selezionato" @@ -2146,6 +2181,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Nessun risultato ritornato" @@ -2168,15 +2207,15 @@ msgstr "Nessun sostenitore" msgid "None" msgstr "Nessuno" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2195,7 +2234,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Non segnalato precedente" @@ -2209,10 +2248,6 @@ msgstr "Non segnalato al comune" msgid "Note" msgstr "Nota" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Tieni presente che per includere delle segnalazioni non confermate, usiamo la data della creazione della segnalazione, la quale potrebbe non essere nello stesso mese in cui la segnalazione stessa è stata poi confermata, quindi i numeri potrebbero saltare un po." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2240,37 +2275,46 @@ msgstr "Ora per inserire la tua segnalazione…" msgid "Now to submit your update…" msgstr "Ora per inserire il tuo aggiornamento…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Vecchio stato" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2309,23 +2353,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Altro" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "altre aree:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2343,19 +2394,19 @@ msgstr "Pagina non trovata" msgid "Parent" msgstr "Parente" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Parziale" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Password (opzionale)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Password:" @@ -2363,7 +2414,7 @@ msgstr "Password:" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2371,19 +2422,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Numero di telefono" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Numero di telefono (opzionale)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefono:" @@ -2399,7 +2455,7 @@ msgstr "Telefono:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2425,12 +2481,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Foto delle piu vicine e recenti segnalazioni" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Inserisci il cursore sulla mappa" @@ -2452,25 +2513,34 @@ msgstr "Per favore cerca di essere educato, conciso e dritto al punto." msgid "Please check the passwords and try again" msgstr "Per favore controlla la password e prova ancora" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Per favore controlla che il tuo indirizzo email è corretto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Per favore controlla che il tuo indirizzo email è corretto" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Per favore scegli una categoria" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2485,39 +2555,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Per favore inserisci un messaggio" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Per favore inserisci un messaggio" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Per favore inserisci la password" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Per favore inserisci il soggetto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Per favore inserire un email valida" @@ -2526,55 +2604,62 @@ msgstr "Per favore inserire un email valida" msgid "Please enter a valid email address" msgstr "Per favore inserire un indirizzo email valido" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Per favore inserire un email valida" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Per favore inserire qualche dettaglio " #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Per favore inserisci la tua email" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Per favore inserisci il tuo indirizzo email" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Per favore inserisci il tuo nome" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Per favore inserisci il tuo nome" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Per favore inserisci il tuo cognome" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Per favore inserisci il tuo titolo" @@ -2623,7 +2708,12 @@ msgstr "" msgid "Please note:" msgstr "Attenzione:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Per favore provvedi ad alcune spiegazioni perché stai riaprendo questa segnalazione" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2663,6 +2753,11 @@ msgstr "Si prega di indicare se il problema è stato risolto" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Per favore scrivi un messaggio" @@ -2672,7 +2767,7 @@ msgid "Please write your update here" msgstr "Per favore scrivi il tuo aggiornamento qui" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Posta" @@ -2681,15 +2776,15 @@ msgstr "Posta" msgid "Posted anonymously at %s" msgstr "Postato anonimamente al %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Postato da %s al %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Postato da %s (%s) al %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Postato da %s al %s" @@ -2701,11 +2796,11 @@ msgstr "" msgid "Previous" msgstr "Precedente" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2722,7 +2817,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privato" @@ -2746,21 +2841,21 @@ msgstr "Problema %s confermato" msgid "Problem %s sent to council %s" msgstr "Problema %s inviato al comune %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problema marcato come aperto." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Il cambio di stato del problema è basato sui risultati del sondaggio" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemi" @@ -2787,7 +2882,7 @@ msgstr "Problemi recentemente segnalati e risolti su FIxMyStreet" msgid "Problems within %.1fkm of %s" msgstr "Problemi dentro %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2813,7 +2908,8 @@ msgstr "" msgid "Property address:" msgstr "L'indirizzo della proprietà:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Fornisci un'aggiornamento" @@ -2822,12 +2918,12 @@ msgstr "Fornisci un'aggiornamento" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Scegliere una password è opzionale, ma farlo ti acconsentirà di riportare più facilmente le future segnalazioni, di aggiungere degli aggiornamenti e gestire le tue segnalazioni." @@ -2840,12 +2936,12 @@ msgstr "" msgid "Public response:" msgstr "Risposte pubbliche:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Pubblica la foto" @@ -2900,7 +2996,7 @@ msgstr "RSS feed di %s, dentro al quartiere %s " msgid "RSS feed of nearby problems" msgstr "RSS feed dei problemi vicino" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2925,7 +3021,7 @@ msgstr "RSS feed degli aggiornamenti su questa segnalazione" msgid "Receive email when updates are left on this problem." msgstr "Ricevi un'email quando gli aggiornamenti sono aggiunti su questa segnalazione." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2939,7 +3035,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Problemi segnalati di recente" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2961,9 +3057,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2971,12 +3067,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3005,11 +3105,11 @@ msgstr "Segnala un abuso" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3024,17 +3124,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Segnala, conosci e discuti sui problemi della tua città " -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Riportati anonimamente al %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Segnalati prima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Segnalato da %s al %s" @@ -3048,27 +3148,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Riportato nella categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Riportato nella categoria %s anonimamente alle %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Riportato nella categoria %s da %s alle %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3077,8 +3177,8 @@ msgstr "" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3086,10 +3186,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Stai segnalando un problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "" @@ -3106,7 +3205,7 @@ msgstr "Segnalazioni in attesa di approvazione" msgid "Reports by destination" msgstr "Segnalato da %s al %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3118,7 +3217,7 @@ msgstr "" msgid "Reports published" msgstr "Segnalazioni pubblicate" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3173,21 +3272,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3206,17 +3306,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -3226,21 +3326,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3251,12 +3351,12 @@ msgstr "Salva modifiche" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3274,7 +3374,7 @@ msgstr "Ricerca Segnalazioni" msgid "Search Users" msgstr "Ricerca Utenti" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Ricerca segnalazioni" @@ -3285,6 +3385,7 @@ msgid "Search:" msgstr "Cerca:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3297,7 +3398,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3306,8 +3407,8 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Seleziona un'area" @@ -3327,11 +3428,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "" @@ -3340,11 +3446,11 @@ msgid "Sent:" msgstr "Inviato:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3353,9 +3459,9 @@ msgid "Share" msgstr "Condividi" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3363,19 +3469,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3383,40 +3489,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Mostra il mio nome pubblicamente" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3427,12 +3530,16 @@ msgstr "Entra" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Entra o crea un nuovo account" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -3448,7 +3555,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Qualche foto di segnalazioni recenti" @@ -3461,15 +3568,19 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3502,20 +3613,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Data di inizio:" #: templates/web/base/admin/body.html:73 @@ -3525,15 +3637,18 @@ msgstr "Data di inizio:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Stato" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Salva modifiche" @@ -3547,17 +3662,19 @@ msgstr "Salva modifiche" msgid "State:" msgstr "Stato:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Stato" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Stati" @@ -3567,7 +3684,7 @@ msgstr "Stati" msgid "Status" msgstr "Status" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Ancora aperto, attraverso il questionario %s" @@ -3580,7 +3697,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Sottocategoria: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Sottocategoria: %s" @@ -3597,18 +3719,19 @@ msgstr "Soggetto" msgid "Subject:" msgstr "Soggetto:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Invia" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3650,7 +3773,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3658,25 +3781,30 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Sommario" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +msgid "Summary statistics" +msgstr "" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Risultati sondaggio" @@ -3684,14 +3812,14 @@ msgstr "Risultati sondaggio" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Testo" @@ -3699,7 +3827,7 @@ msgstr "Testo" msgid "Text only version" msgstr "Solo versione testuale" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3726,7 +3854,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Grazie per aver aggiunto la tua foto. Abbiamo adesso bisogno di localizzare il problema, quindi inserisci il nome della strada piu vicina o il codice postale nel box qui sopra :" @@ -3742,7 +3870,7 @@ msgstr "" 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Questa posizione non sembra essere nel Regno Unito, si prega di riprovare." @@ -3752,11 +3880,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "" @@ -3788,8 +3916,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3822,8 +3950,8 @@ msgstr "Il comune non sarà in grado di fare qualcosa finchè non lascerai più msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "L'errore era: %s" @@ -3865,7 +3993,7 @@ msgstr "Gli ultimi problemi risolti segnalati dagli utenti" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Gli ultimi problemi dentro i confini di {{NAME}} segnalati dagli utenti" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3890,7 +4018,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3901,33 +4029,38 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "E' accaduto un problema con la tua combinazione email/password. Se non ti ricordi la password, o non né hai ancora una, per favore riempi qui gli ‘ ed entra con l'email&rsquo, nella sezione del form" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "E' accaduto un problema con la tua combinazione email/password. Per favore prova ancora." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "E' accaduto un problema con la tua combinazione email/password. Se non ti ricordi la password, o non né hai ancora una, per favore riempi qui gli ‘ ed entra con l'email&rsquo, nella sezione del form" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "C'è stato un problema con il tuo aggiornamento. Per favore prova ancora." @@ -3935,7 +4068,7 @@ msgstr "C'è stato un problema con il tuo aggiornamento. Per favore prova ancora 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." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "" @@ -3990,26 +4123,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Questa informazione è richiesta" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4026,7 +4167,7 @@ msgstr "Questo problema non è stato risolto" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4036,23 +4177,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Questo report è stato sottomesso in maniera anonima" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4063,7 +4204,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4075,20 +4216,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Titolo" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Per sapere quali segnalazioni locali abbiamo per te, inserisci per favore il tuo codice postale o il nome della via e della zona" @@ -4100,44 +4242,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Totale" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Totale" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4150,18 +4284,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Prova ancora" @@ -4176,7 +4311,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4185,15 +4324,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Non confermato" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Sconosciuto" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -4203,13 +4338,14 @@ msgstr "" msgid "Unknown error" msgstr "Errore sconosciuto" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4234,12 +4370,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4247,16 +4383,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "Aggiornato da {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Aggiorna segnalazione come risolta" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -4270,20 +4406,20 @@ msgstr "" msgid "Updated" msgstr "Aggiornato" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Postato da %s (%s) al %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Postato da %s al %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4291,7 +4427,7 @@ msgid "Updated!" msgstr "Aggiornato!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Aggiornamenti" @@ -4338,40 +4474,81 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Email aggiunta alla lista abusi" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Email già presente nella lista abusi" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "(Email nella tabella degli abusi)" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Utenti" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Utenti" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Tuo indirizzo email" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Il tuo numero di telefono" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4393,12 +4570,7 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4408,20 +4580,25 @@ msgstr "" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Abbiamo trovato più di una corrispondenza per questa posizione. Mostriamo fino a dieci risultati, per favore prova una ricerca differente se quello che cercavi non è qui." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Ci scusiamo, non possiamo trovare questa zona." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "" @@ -4429,6 +4606,12 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "Lo invieremo noi al comune responsabile a tuo nome" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Abbiamo trovato più di una corrispondenza per questa posizione. Mostriamo fino a dieci risultati, per favore prova una ricerca differente se quello che cercavi non è qui." + #: 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." @@ -4438,8 +4621,8 @@ msgstr "Useremo le tue informazioni personali solo in accordo con la nostra MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4506,16 +4693,7 @@ msgstr "Scrivere il tuo messaggio interamente con lettere maiuscole diventa di d msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Anno" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4530,7 +4708,7 @@ msgstr "Anno" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Si" @@ -4543,7 +4721,7 @@ msgstr "Si ho già la password" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4560,7 +4738,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4586,7 +4764,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4594,7 +4772,7 @@ msgstr "" 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:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4621,18 +4799,38 @@ msgstr "" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Hai localizzato il problema nel punto segnato sulla mappa dal segnetto verde. Se questa non è la corretta posizione, clicca semplicemente ancora sulla mappa." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Il tuo indirizzo email è stato confermato con successo." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Il tuo indirizzo email è stato confermato con successo." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Il tuo indirizzo email è stato confermato con successo." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Il tuo indirizzo email è stato confermato con successo." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Ti sei correttamente iscritto; per favore controlla e conferma i tuoi dettagli:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Il tuo indirizzo email è stato confermato con successo." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4656,36 +4854,43 @@ msgid "Your Reports" msgstr "Tue segnalazioni" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "La tua email" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Tuo indirizzo email" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Tuo indirizzo email" + #: templates/web/base/report/updates-sidebar-notes.html:3 msgid "Your information will only be used in accordance with our privacy policy" msgstr "" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4696,19 +4901,19 @@ msgstr "Il tuo nome" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4719,8 +4924,8 @@ msgstr "Tua password" msgid "Your password has been changed" msgstr "La tua password è stata cambiata" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Il tuo numero di telefono" @@ -4729,7 +4934,7 @@ msgstr "Il tuo numero di telefono" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Tue segnalazioni" @@ -4738,25 +4943,40 @@ msgstr "Tue segnalazioni" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "La tua password è stata cambiata" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4773,8 +4993,8 @@ msgstr "comune" msgid "didn't use map" msgstr "mappa non usata" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4797,22 +5017,23 @@ msgstr "ultimo aggiornamento %s" msgid "less than a minute" msgstr "meno di un minuto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "non disponibile" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "oppure fatti localizzare automaticamente" @@ -4852,7 +5073,7 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4860,11 +5081,11 @@ msgstr "" msgid "today" msgstr "oggi" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4872,14 +5093,24 @@ msgstr "" msgid "used map" msgstr "mappa usata" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Email già presente nella lista abusi" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Email aggiunta alla lista abusi" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4941,35 +5172,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5039,6 +5270,24 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "By Date" +#~ msgstr "Per data" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "La segnalazione è confermata tra %s e %s" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Includi segnalazioni non confermate" + +#~ msgid "No council" +#~ msgstr "Nessuno comune" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Tieni presente che per includere delle segnalazioni non confermate, usiamo la data della creazione della segnalazione, la quale potrebbe non essere nello stesso mese in cui la segnalazione stessa è stata poi confermata, quindi i numeri potrebbero saltare un po." + +#~ msgid "Year" +#~ msgstr "Anno" + #~ msgid "%s ward, %s" #~ msgstr "%s quartiere, %s" @@ -5066,9 +5315,6 @@ msgstr[1] "" #~ msgid "Investigating" #~ msgstr "Investigando" -#~ msgid "Not Responsible" -#~ msgstr "Non responsabile" - #~ msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" #~ msgstr "O puoi iscriverti agli avvisi basati sul tuo quartiere o comune di appartenenza:" diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po index 2a5e5277dee..c8abac20b96 100644 --- a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Lithuanian (Lithuania) (https://www.transifex.com/mysociety/teams/12067/lt_LT/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "ir" @@ -32,6 +32,10 @@ msgstr "ir" msgid " or " msgstr "arba" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d pakeitimai pagal %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s tarybos kontaktai – %s patvirtinti, %s nepatvirtinti" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s tiesioginiai atnaujinimai" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s klausimynai išsiųsti – %s atsakyti (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s klausimynai išsiųsti – %s atsakyti (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Elektroninis paštas piktnaudžiavo lentelėje)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(pavyzdžiui, grafitis, šiukšlės, duobė kelyje ar gatvės apšvietimas)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -160,8 +164,8 @@ msgstr "(išsiųsta į abu)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Išsirinktite kategorija --" @@ -174,14 +178,6 @@ msgstr "--Išsirinkinte šabloną--" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -193,16 +189,16 @@ msgstr "" "Turbūt dėl to \"padengta sritis\" yra tuščia (žemiau).
\n" "Galbūt pridėkite MAPIT_TYPES į savo config failą?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -211,33 +207,52 @@ msgstr "" msgid "%s live problems" msgstr "%s Problemos tiesiogiai" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Ne Leisti patvirtinti mano pranešimą el. paštu" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Ne Leisti patvirtinti mano pranešimą el. paštu" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Ne Leisti patvirtinti mano atnaujinimą el. paštu" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Ne Leisti patvirtinti mano atnaujinimą el. paštu" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Ne leisti man prisijungti el. paštu" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Ne leisti man prisijungti el. paštu" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 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." -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Taip Aš turiu slaptažodį" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -254,11 +269,17 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "pridėti instituciją" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Drausti el. paštą" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -281,11 +302,17 @@ msgstr "Pridėti naują kategoriją" msgid "Add option" msgstr "(pasirinktinai)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Nėra telefono numerio)" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "Įdėti į trumpajį sąrašą" @@ -295,23 +322,23 @@ msgstr "Įdėti į trumpajį sąrašą" msgid "Add user" msgstr "Pridėti vartotoją" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "Pridėti/redaguoti problemų kategorijas" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "Pridėti/redaguoti atsakymų prioritetus" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "Pridėti/redaguoti atsakymo šablonus" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Pridėta %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -335,9 +362,10 @@ msgstr "" msgid "Alert me to future updates" msgstr "Įspėti mane apie atnaujinimus" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -346,12 +374,13 @@ msgstr "" msgid "All Reports" msgstr "Visi Pranešimai" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -367,17 +396,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Visi pranešimai" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Visi pranešimai nuo %s ir %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -415,7 +444,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -426,7 +456,7 @@ msgstr "" msgid "Area covered" msgstr "Vietovė pažymėta" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -440,7 +470,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Priskirti kitai kategorijai:" @@ -452,7 +482,7 @@ msgstr "Priskirti išoriniai institucijai:" msgid "Assign to subdivision:" msgstr "Priskirti padaliniui:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -468,12 +498,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Neatsakingas" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -481,18 +516,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -506,20 +533,21 @@ msgstr "Laukiama " msgid "Back" msgstr "Atgal" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Drausti el. paštą" +#, fuzzy +msgid "Ban user" +msgstr "Pažymėti vartotoją" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Institucijos" @@ -530,14 +558,10 @@ msgstr "Institucijos" msgid "Body" msgstr "Institucija" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Institucija:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Pagal Datą" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -550,8 +574,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Nematote žemėlapio? Praleiskite šitą žingsnį" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -562,30 +587,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategorija" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategorija" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -593,17 +624,17 @@ msgstr "Problemų kategorijoje tvarkymo sparta > 4 savaitės senumo" msgid "Category:" msgstr "Kategorija:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategorija: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -611,10 +642,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Pakeisti slaptažodį" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Nėra telefono numerio)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -645,19 +682,14 @@ 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Paspausti čia arba įvesti dd/mm/yyyy" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Paspaukite ant žemėlapio, kad pranešti problemą" @@ -685,18 +717,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Uždaryta" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Uždaryta " @@ -711,16 +744,17 @@ msgid "Cobrand" msgstr "Cobrand" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Cobrand informacija:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -728,7 +762,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Nustatymai" @@ -737,7 +771,7 @@ msgstr "Nustatymai" msgid "Confirm" msgstr "Patvirtinti" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Patvirtinti paskyrą" @@ -756,14 +790,10 @@ msgstr "Patvirtinimas" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Patvirtinta" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Patvirtinti pranešimai tarp %s ir %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -790,8 +820,8 @@ msgstr "Susisiekite su komanda" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Vartotojas nerastas" @@ -809,43 +839,16 @@ msgstr "Taryba" msgid "Council contacts for %s" msgstr "Tarybos kontaktai skirti %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Taryba:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Skaičiavimas" @@ -867,39 +870,44 @@ msgstr "Sukurti kategoriją" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Sukurti šabloną" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Sukurta" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Sukurta:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Esama būsena" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -910,14 +918,14 @@ msgstr "Šiuo metu ne viena institucija nėra sukurta." msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Įrankių juosta" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Padalinys atliko per 5 darbo dienas" @@ -929,12 +937,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Pašalinti šabloną" @@ -945,8 +953,8 @@ msgstr "Pašalinti šabloną" msgid "Deleted" msgstr "Ištrinta" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -962,6 +970,10 @@ msgstr "Aprašymas" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -974,6 +986,10 @@ msgstr "Išsamiau" msgid "Details:" msgstr "Išsamiau:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Perduota" @@ -987,8 +1003,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "Diligency prize league table" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -997,7 +1013,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1005,7 +1021,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1025,11 +1041,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1052,9 +1068,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Redaguoti" @@ -1064,33 +1081,33 @@ msgstr "Redaguoti" msgid "Edit body details" msgstr "Redaguoti institucijos informaciją" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Redagavimo problema %d" @@ -1111,7 +1128,6 @@ msgstr "Redaktorius" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1119,17 +1135,20 @@ msgstr "Redaktorius" msgid "Email" msgstr "El. paštas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "El. paštas pridėtas prie piktnaudžiavimo sąrašo" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Slaptažodis (nebūtina)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1138,19 +1157,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "El. paštas jau yra piktnaudžiavimo sąraše" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "El. paštas:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "El. paštas: %s" @@ -1167,8 +1185,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/body-form.html:123 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" @@ -1178,8 +1196,9 @@ 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Pabaigos Data:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1200,14 +1219,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Įveskite artimiausia pašto kodą arba gatvės pavadinimą ir rajoną" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Įveskite artimiausios gatvės pavadinimą ir rajoną" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Įveskite slaptažodį" @@ -1225,8 +1244,8 @@ msgstr "įveskite problemos detales" msgid "Error" msgstr "Klaida" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1251,7 +1270,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1267,7 +1286,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1279,7 +1298,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1291,7 +1310,7 @@ msgstr "Papildoma informacija:" msgid "Extra data:" msgstr "Papildoma informacija:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1321,21 +1340,22 @@ msgstr "Suvarkyti tai pasirenkant pažymėta vietovę Reda #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Sutvarkyta" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Sutvarkyta - Savivaldybe" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Sutvarkyta - Vartotojas" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Pažymeti kaip ištrinta" @@ -1343,7 +1363,7 @@ msgstr "Pažymeti kaip ištrinta" msgid "Flag user" msgstr "Pažymėti vartotoją" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Pažymėta" @@ -1352,7 +1372,7 @@ msgstr "Pažymėta" msgid "Flagged reports and users" msgstr "Flagged reports and users" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Flagged users are listed on the flagged page." @@ -1360,8 +1380,8 @@ msgstr "Flagged users are listed on the flagged page." msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Pažymėta:" @@ -1381,7 +1401,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Daugiau informacijos rasite How FixMyStreet uses Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1401,8 +1421,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Dažniausiai Užduodami Klausimai" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1435,12 +1459,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Pirmyn" @@ -1448,7 +1472,7 @@ msgstr "Pirmyn" msgid "Going to send questionnaire?" msgstr "Ar ruošiates išsiųsti klausimyną?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1456,6 +1480,14 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Problemų sukurimo grafikas pagal statusą per laiką" +#: templates/web/base/dashboard/index.html:93 +msgid "Group by %s" +msgstr "" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Ar ši problema buvo sutvarkyta?" @@ -1476,21 +1508,26 @@ msgstr "Pagalba" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Naujausios gretimų pranešimų nuotraukos" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Labas %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Paslėpta" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1511,21 +1548,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Paslėpti senus" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Paslėpti smeigtukus" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1537,7 +1571,7 @@ msgstr "" msgid "History" msgstr "Istorija" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Pradžia" @@ -1596,6 +1630,10 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1604,6 +1642,10 @@ 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1612,7 +1654,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Jei norite, kad šis šablonas būtų naudojamas tik tam tikroms kategorijoms, pasirinkite jas čia. Pagal nutylėjimą jis bus rodomas visoms kategorijoms." @@ -1621,7 +1663,7 @@ msgstr "Jei norite, kad šis šablonas būtų naudojamas tik tam tikroms kategor msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1701,11 +1743,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "Pridėti siuntėjo asmeninę informacija" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Pridėti nepatvirtintus pranešimus" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Incorrect has_photo value \"%s\"" @@ -1717,7 +1755,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1729,26 +1767,18 @@ msgstr "Internal notes" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Invalid agency_responsible value %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Klaidina pabaigos data" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Pasirinktas klaidingas formatas %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Klaidinga pradžios data" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "Patikrinkite mūsų D.U.K gal atsakymas yra ten." @@ -1767,7 +1797,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1792,12 +1822,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1823,18 +1848,14 @@ msgstr "Last update:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1843,13 +1864,13 @@ msgstr "" msgid "List all reported problems" msgstr "Pateikti visas praneštas problemas" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Kraunama..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1881,12 +1902,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1894,11 +1918,11 @@ msgstr "" msgid "MAP" msgstr "MAP" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1910,11 +1934,11 @@ msgstr "Žemėlapis" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 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:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1934,45 +1958,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Missing jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Moderated by division within one working day" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Mėnuo" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1990,9 +2014,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2003,19 +2027,23 @@ msgstr "Vardas" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Vardas:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Vardas: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2025,12 +2053,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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 " -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2046,19 +2074,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Nauja dalis pridėta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Naujas kategorijos kontaktas pridetas" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2079,6 +2111,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Nėra telefono numerio)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2108,18 +2145,19 @@ msgstr "Naujos problemos {{NAME}} riba FixMyStreet" msgid "New reports" msgstr "Nauji pranešimai" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "New state" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Naujas šablonas" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2127,7 +2165,7 @@ msgstr "" msgid "Next" msgstr "Kitas" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2139,22 +2177,18 @@ msgstr "Kitas" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Ne" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Nėra institucijos" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Nėra savivaldybės" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Nepasirinkta savivaldybė" @@ -2184,6 +2218,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Jokių rezultatų" @@ -2208,15 +2246,15 @@ msgstr "Jokių rėmėjų" msgid "None" msgstr "Nė vienas" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2239,7 +2277,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "Ne mano padaliniui" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Nebuvo pranešta anksčiau" @@ -2253,10 +2291,6 @@ msgstr "Nepranešta savivaldybei" msgid "Note" msgstr "Pastaba" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2284,37 +2318,46 @@ msgstr "Dabar patvirtinti jūsų report…" msgid "Now to submit your update…" msgstr "Dabar patvirtinti jūsų update…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "Gerai" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Sena būklė" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2353,23 +2396,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Kita" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "Kita" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2387,19 +2437,19 @@ msgstr "Puslapis nerastas" msgid "Parent" msgstr "Parent" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Dalinis" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Slaptažodis (nebūtina)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Slaptažodis:" @@ -2407,7 +2457,7 @@ msgstr "Slaptažodis:" msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2415,19 +2465,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefono numeris" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Telefono numeris (nebūtina)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefonas:" @@ -2443,7 +2498,7 @@ msgstr "Telefonas:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2469,12 +2524,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Naujausios gretimų pranešimų nuotraukos" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Padėkite smeigtuką ant žemėlapio" @@ -2496,25 +2556,34 @@ msgstr "Prašome būti mandagūs, rašyti glaustai ir tiksliai." msgid "Please check the passwords and try again" msgstr "Prašome patikrinti slaptažodžius ir pabandykite dar kartą" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Prašome patikrinti ar jūsų el. pašto adresas teisingas " + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Prašome pasirinkti kategoriją" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Prašome ištaisyti klaidas " @@ -2529,39 +2598,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Prašome įvesti žinutę" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Prašome įvesti savo telefono numerį" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Prašome įvesti slaptažodį" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Prašome įvesti temą" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Prašome įvesti galiojantį el. paštą" @@ -2570,55 +2647,62 @@ msgstr "Prašome įvesti galiojantį el. paštą" msgid "Please enter a valid email address" msgstr "Prašome įvesti galiojantį el. pašto adresą" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Prašome įvesti savo telefono numerį" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Prašome įvesti daugiau informacijos" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Prašome įvesti savo el. paštą" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Prašome įvesti savo el. pašto adresą" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Prašome įvesti savo vardą" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Prašome įvesti savo vardą" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Prašome įvesti savo telefono numerį" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Prašome įvesti savo pavardę" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Prašome įvesti savo vardą" @@ -2667,7 +2751,12 @@ msgstr "" msgid "Please note:" msgstr "Atkreipkite dėmėsį:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Prašome pateikti priežastis, kodėl jūs naujinate šį pranešimą" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2707,6 +2796,11 @@ msgstr "Prašome nurodyti, ar problema buvo sutvarkyta" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Prašome įvesti žinutę" @@ -2716,7 +2810,7 @@ msgid "Please write your update here" msgstr "Prašome raštyti savo naujinimą čia" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Įkelti" @@ -2725,15 +2819,15 @@ msgstr "Įkelti" msgid "Posted anonymously at %s" msgstr "Pateikta anonimiškai %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "" @@ -2745,11 +2839,11 @@ msgstr "" msgid "Previous" msgstr "Ankstesnis" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2766,7 +2860,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privatus" @@ -2790,21 +2884,21 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "Problema %s išsiųsta savivaldybei %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Problemos pasiskirstymas pagal valstybės" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problema pažymėta kaip atidaryta" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Problemos būklės pakeitimas remiantis tyrimo rezultatais" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemos" @@ -2831,7 +2925,7 @@ msgstr "Neseniai praneštos problemos FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "Problemos %.1fkm atstumu aplink šią vietovę" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2857,7 +2951,8 @@ msgstr "" msgid "Property address:" msgstr "Nuosavybės adresas:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Pateikti naujinimą" @@ -2866,12 +2961,12 @@ msgstr "Pateikti naujinimą" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Pateikti vardą ir slaptažodį yra nebūtina, tačiau pateiktus bus jums papraščiau pranešti problemas, pateikti naujinimus ir tvarkyti savo pranešimus." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Pateikti slaptažodį yra nebūtina, tačiau pateiktus bus jums papraščiau pranešti problemas, pateikti naujinimus ir tvarkyti savo pranešimus." @@ -2884,12 +2979,12 @@ msgstr "" msgid "Public response:" msgstr "Viešas atsakymas:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Paskelbti nuotrauką" @@ -2944,7 +3039,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2969,7 +3064,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2983,7 +3078,7 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -3005,9 +3100,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -3015,12 +3110,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3049,11 +3148,11 @@ msgstr "" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3068,17 +3167,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Praneškite, pamatykite arba diskutuokite apie vietines problemas" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "" @@ -3092,27 +3191,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3121,8 +3220,8 @@ msgstr "" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3130,10 +3229,9 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "" @@ -3149,7 +3247,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3161,7 +3259,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3215,21 +3313,22 @@ msgid "Response Templates" msgstr "Atsakymo Šablonai" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "%s Atsakymo Šablonai" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3248,17 +3347,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -3268,21 +3367,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3293,12 +3392,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3317,7 +3416,7 @@ msgstr "" msgid "Search Users" msgstr "" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "" @@ -3328,6 +3427,7 @@ msgid "Search:" msgstr "" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3340,7 +3440,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3349,8 +3449,8 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "" @@ -3370,11 +3470,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "" @@ -3383,11 +3488,11 @@ msgid "Sent:" msgstr "" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3396,9 +3501,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3406,19 +3511,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3426,40 +3531,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3470,12 +3572,16 @@ msgstr "" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -3491,7 +3597,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "" @@ -3504,15 +3610,19 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3545,20 +3655,20 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +msgid "Start Date" msgstr "" #: templates/web/base/admin/body.html:73 @@ -3568,15 +3678,18 @@ msgstr "" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 msgid "State changed to:" msgstr "" @@ -3589,16 +3702,18 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "" @@ -3608,7 +3723,7 @@ msgstr "" msgid "Status" msgstr "" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "" @@ -3621,7 +3736,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Kategorija" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "" @@ -3638,18 +3758,19 @@ msgstr "" msgid "Subject:" msgstr "" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3690,7 +3811,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3698,25 +3819,30 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +msgid "Summary statistics" +msgstr "" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -3724,14 +3850,14 @@ msgstr "" msgid "Template «%s»" msgstr "Šablonas «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Šablonai" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -3739,7 +3865,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3766,7 +3892,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" @@ -3782,7 +3908,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3792,11 +3918,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "" @@ -3828,8 +3954,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3862,8 +3988,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "" @@ -3905,7 +4031,7 @@ msgstr "" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3930,7 +4056,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3941,33 +4067,37 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3975,7 +4105,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "" @@ -4030,26 +4160,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4066,7 +4204,7 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4076,23 +4214,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4103,7 +4241,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4115,20 +4253,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" @@ -4140,44 +4279,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4190,18 +4321,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "" @@ -4216,7 +4348,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4225,15 +4361,11 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -4243,13 +4375,14 @@ msgstr "" msgid "Unknown error" msgstr "" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4274,12 +4407,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4287,16 +4420,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -4310,20 +4443,20 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Pastaba: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Pastaba: %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4331,7 +4464,7 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" @@ -4378,40 +4511,80 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "El. paštas pridėtas prie piktnaudžiavimo sąrašo" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "El. paštas jau yra piktnaudžiavimo sąraše" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "į piknaudžiavimo lentelę?" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +msgid "User:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Drausti el. paštą" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "(Nėra telefono numerio)" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4433,12 +4606,7 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4448,20 +4616,24 @@ msgstr "" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." +msgid "We found more than one match for that location." msgstr "" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "" @@ -4469,6 +4641,11 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "Mes nusiūsime ją tarybai jūsų vardu" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4478,8 +4655,8 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4507,7 +4684,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4530,6 +4707,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4546,16 +4727,7 @@ msgstr "" msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4570,7 +4742,7 @@ msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "" @@ -4583,7 +4755,7 @@ msgstr "" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4600,7 +4772,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4626,7 +4798,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4634,7 +4806,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4661,18 +4833,38 @@ msgstr "" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Prašome įvesti savo telefono numerį" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Prašome įvesti savo telefono numerį" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Prašome įvesti savo telefono numerį" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Prašome įvesti savo telefono numerį" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4696,36 +4888,42 @@ msgid "Your Reports" msgstr "" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +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 "" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4736,19 +4934,19 @@ msgstr "" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4759,8 +4957,8 @@ msgstr "" msgid "Your password has been changed" msgstr "" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "" @@ -4769,7 +4967,7 @@ msgstr "" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "" @@ -4778,25 +4976,39 @@ msgstr "" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +msgid "Your token has been generated" +msgstr "" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4813,8 +5025,8 @@ msgstr "" msgid "didn't use map" msgstr "" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4837,22 +5049,23 @@ msgstr "" msgid "less than a minute" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "" @@ -4892,7 +5105,7 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4900,11 +5113,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4912,14 +5125,24 @@ msgstr "" msgid "used map" msgstr "" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "El. paštas jau yra piktnaudžiavimo sąraše" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "El. paštas pridėtas prie piktnaudžiavimo sąrašo" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4989,7 +5212,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -4997,7 +5220,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" @@ -5005,7 +5228,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" @@ -5013,7 +5236,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -5021,7 +5244,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5101,6 +5324,36 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(Elektroninis paštas piktnaudžiavo lentelėje)" + +#~ msgid "By Date" +#~ msgstr "Pagal Datą" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Paspausti čia arba įvesti dd/mm/yyyy" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Patvirtinti pranešimai tarp %s ir %s" + +#~ msgid "Hide old" +#~ msgstr "Paslėpti senus" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Pridėti nepatvirtintus pranešimus" + +#~ msgid "Invalid end date" +#~ msgstr "Klaidina pabaigos data" + +#~ msgid "Invalid start date" +#~ msgstr "Klaidinga pradžios data" + +#~ msgid "No council" +#~ msgstr "Nėra savivaldybės" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" + #~ msgid "%s ward, %s" #~ msgstr "%s rajonas, %s" @@ -5131,9 +5384,6 @@ msgstr[2] "" #~ msgid "Investigating" #~ msgstr "Tyriama" -#~ msgid "Not Responsible" -#~ msgstr "Neatsakingas" - #~ msgid "Or problems reported to:" #~ msgstr "Arba problemos praneštos:" diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po index 9aaf9f8865e..96c034e1965 100644 --- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Malay (https://www.transifex.com/mysociety/teams/12067/ms/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr " dan " @@ -32,6 +32,10 @@ msgstr " dan " msgid " or " msgstr " atau " +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d suntingan daripada %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s cara hubungan majlis – %s disahkan, %s belum disah" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s update secara langsung" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s soalan selidik dihantar – %s dijawabi (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s soalan selidik dihantar – %s dijawabi (%s%%)" msgid "%s ref: %s" msgstr "%s ruj; %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Emel dalam jadual penyalahguna)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -161,8 +165,8 @@ msgstr "(hantar kepada kedua-dua)" msgid "(we also have RSS feeds for problems within %s)" msgstr "Feed RSS untuk masalah dalam %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Pilih kategori --" @@ -175,14 +179,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -194,16 +190,16 @@ msgstr "" "Mungkin ini kenapa \"kawasan ditutupi\" adalah kosong (bawah).
\n" "Tambahkan MAPIT_TYPES ke dalam fail konfigurasi anda?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -212,33 +208,52 @@ msgstr "" msgid "%s live problems" msgstr "%s masalah" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Tidak Benarkan aku mengesahkan laporanku dengan emel" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Tidak Benarkan aku mengesahkan laporanku dengan emel" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Tidak Benarkan aku mengesahkan kemas kiniku dengan emel" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Tidak Benarkan aku mengesahkan kemas kiniku dengan emel" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Tidak benarkan aku log masuk dengan emel" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Tidak benarkan aku log masuk dengan emel" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Ya Aku ada kata laluan" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -252,11 +267,17 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Tambah badan" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Melarang alamat emel" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -279,11 +300,17 @@ msgstr "Tambah kategori baru" msgid "Add option" msgstr "(tidak diwajibkan)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "Nombor telefon anda" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -293,23 +320,23 @@ msgstr "" msgid "Add user" msgstr "Tambah pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "%s telah ditambahi" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -333,9 +360,10 @@ msgstr "Pemberitahuan %d dihenti (dibuat pada %s)" msgid "Alert me to future updates" msgstr "Maklumkan aku sebarang kemas kini masa depan" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -344,12 +372,13 @@ msgstr "" msgid "All Reports" msgstr "Semua Laporan" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -365,17 +394,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Semua laporan" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Semua laporan antara %s dan %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -413,7 +442,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -424,7 +454,7 @@ msgstr "" msgid "Area covered" msgstr "Kawasan dilintungi" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -438,7 +468,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Ditugaskan kepada kategori lain:" @@ -450,7 +480,7 @@ msgstr "Ditugaskan kepada badan luaran:" msgid "Assign to subdivision:" msgstr "Ditugaskan kepada bahagian bawah:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -466,12 +496,17 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Tidak Bertanggungjawab" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -479,18 +514,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -504,20 +531,21 @@ msgstr "Mengunggu penyederhanaan" msgid "Back" msgstr "Balik" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Melarang alamat emel" +#, fuzzy +msgid "Ban user" +msgstr "Tanda pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Badan" @@ -528,14 +556,10 @@ msgstr "Badan" msgid "Body" msgstr "Badan" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Badan:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Dengan Tarikh" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -548,8 +572,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -560,30 +585,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategori" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategori rata masalah diselesai > 4 minggu" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -591,17 +622,17 @@ msgstr "Kategori rata masalah diselesai > 4 minggu" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategori: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -609,10 +640,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Menukar Kata Laluan" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "Nombor telefon anda" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -634,19 +671,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Klik sini atau masukkan sebagai dd/mm/yyyy" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klik peta untuk melaporkan masalah" @@ -674,18 +706,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Ditutup" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Ditutup oleh majlis" @@ -700,16 +733,17 @@ msgid "Cobrand" msgstr "Cobrand" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Data Cobrand" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -717,7 +751,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurasi" @@ -726,7 +760,7 @@ msgstr "Konfigurasi" msgid "Confirm" msgstr "Sah" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Mengesahkan Akaun" @@ -745,14 +779,10 @@ msgstr "Pengesahan" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Disahkan" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Laporan disahkan antara %s dan %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -779,8 +809,8 @@ msgstr "Menghubungi pasukan" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Tidak dapat mencari pengguna" @@ -798,43 +828,16 @@ msgstr "Majlis" msgid "Council contacts for %s" msgstr "Hubungan Majlis untuk %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "Rujukan majlis: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Majlis:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Kiraan" @@ -856,39 +859,44 @@ msgstr "Kategori baru" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Diwujudkan" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Diwujudkan:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Keadaan semasa" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -899,14 +907,14 @@ msgstr "Belum ada badan wujud pada masa kini." msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Papan pemuka" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja" @@ -918,12 +926,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -934,8 +942,8 @@ msgstr "" msgid "Deleted" msgstr "Dipadam" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -951,6 +959,10 @@ msgstr "Huraian" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -963,6 +975,10 @@ msgstr "Perincian" msgid "Details:" msgstr "Perincian:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Didelegasikan" @@ -976,8 +992,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "Jadual liga hadiah ketekunan" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -986,7 +1002,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -994,7 +1010,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1014,11 +1030,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1038,9 +1054,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Menyunting" @@ -1050,33 +1067,33 @@ msgstr "Menyunting" msgid "Edit body details" msgstr "Edit perincian badah" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Sedang edit masalah %d" @@ -1097,7 +1114,6 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1105,17 +1121,20 @@ msgstr "Editor" msgid "Email" msgstr "Emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Emel ditambahkan kepada senarai penyalahguna" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Kata Laluan (tidah diwajibkan)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1124,19 +1143,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Emel telah dalam senarai penyalahguna" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Emel:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Emel: %s" @@ -1149,16 +1167,17 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Tarikh Akhir:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1179,14 +1198,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Masukkan poskod terdekat, atau nama jalan dan kawasan" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Masukkan nama jalan dan kawasan terdekat" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Masukkan kata laluan" @@ -1204,8 +1223,8 @@ msgstr "Masukkan perincian masalah tersebut" msgid "Error" msgstr "Ralat" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1230,7 +1249,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1246,7 +1265,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1258,7 +1277,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1270,7 +1289,7 @@ msgstr "Data tambahan:" msgid "Extra data:" msgstr "Data tambahan:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1300,21 +1319,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Diselesai" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Diselesai - Majlis" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Diselesai - Pengguna" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Tanda sebagai dipadam" @@ -1322,7 +1342,7 @@ msgstr "Tanda sebagai dipadam" msgid "Flag user" msgstr "Tanda pengguna" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Ditanda" @@ -1331,7 +1351,7 @@ msgstr "Ditanda" msgid "Flagged reports and users" msgstr "Laporan dan pengguna ditanda" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1339,8 +1359,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Ditanda:" @@ -1360,7 +1380,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Untuk maklumat lanjut, lihat Bagaimana FixMyStreet mengguna Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1380,8 +1400,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Soalan lazim" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1414,12 +1438,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Pergi" @@ -1427,7 +1451,7 @@ msgstr "Pergi" msgid "Going to send questionnaire?" msgstr "Teruskan dengan menghantar soalan selidik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1435,6 +1459,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Graf masalah dibuat dengan status dari masa ke masa" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "dari %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Adakan masalah ini telah diselesai?" @@ -1455,21 +1488,26 @@ msgstr "Bantuan" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Foto laporan terdekat baru-baru ini " + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hi %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Tersembunyi" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1490,21 +1528,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Sembunyikan lama" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Sembunyikan pin" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1516,7 +1551,7 @@ msgstr "" msgid "History" msgstr "Sejarah" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Home" @@ -1573,12 +1608,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1587,7 +1630,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1596,7 +1639,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1668,11 +1711,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "Termasuk perincian peribadi pelapor" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Termasuk laporan yang belum disahkan" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Nilai has_photo \"%s\" salah" @@ -1684,7 +1723,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1696,26 +1735,18 @@ msgstr "Nota dalaman" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Nilai agency_responsible %s salah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Tarikh berakhir yang tak sah" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Format dinyatakan %s salah" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Tarikh mula yang tak sah" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1734,7 +1765,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1759,12 +1790,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1790,18 +1816,14 @@ msgstr "Kemas kini terakhir:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1810,13 +1832,13 @@ msgstr "" msgid "List all reported problems" msgstr "Senaraikan semua laporan masalah" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Loading..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1848,12 +1870,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1861,11 +1886,11 @@ msgstr "" msgid "MAP" msgstr "PETA" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1877,11 +1902,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1901,45 +1926,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Kehilangan jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Bulan" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1957,9 +1982,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1970,19 +1995,23 @@ msgstr "Nama" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Nama:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Nama: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1992,12 +2021,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2011,19 +2040,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Badan baru ditambahi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Kategori hubungan baru ditambahi" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2044,6 +2077,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "Nombor telefon anda" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2073,18 +2111,19 @@ msgstr "Masalah baru dalam sempadan {{NAME}} dalam FixMyStreet" msgid "New reports" msgstr "Laporan baru" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Negeri baru" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2092,7 +2131,7 @@ msgstr "" msgid "Next" msgstr "Seterusnya" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2104,22 +2143,18 @@ msgstr "Seterusnya" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Tidak" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Tiada badan" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Tiada majlis" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Tiada majlis dipilihi" @@ -2149,6 +2184,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Tiada keputusan." @@ -2171,15 +2210,15 @@ msgstr "Tiada penyokong" msgid "None" msgstr "Tiada" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2198,7 +2237,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "Bukan untuk bahagian bawah aku" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Belum dilaporkan" @@ -2212,10 +2251,6 @@ msgstr "Tidak dilaporkan kepada majlis" msgid "Note" msgstr "Nota" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2243,37 +2278,46 @@ msgstr "" msgid "Now to submit your update…" msgstr "Hantarkan kemas kini anda sekarang…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Keadaan lama" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2312,23 +2356,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Lain-lain" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "kawasan lain:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2346,19 +2397,19 @@ msgstr "Laman Tidak Dijumpai" msgid "Parent" msgstr "Induk" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Separa" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Kata Laluan (tidah diwajibkan)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Kata Laluan:" @@ -2366,7 +2417,7 @@ msgstr "Kata Laluan:" msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2374,19 +2425,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Nombor telefon" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Nombor telefon (tidak diwajibkan)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2402,7 +2458,7 @@ msgstr "Telefon:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2428,12 +2484,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Foto laporan terdekat baru-baru ini " -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Letakkan pin atas peta" @@ -2455,25 +2516,34 @@ msgstr "Sila bersopan, ringkas dan tepat." msgid "Please check the passwords and try again" msgstr "Sila periksa kata laluan dan cuba lagi" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Sila periksa sama ada alamat emel anda adalah betul" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Sila periksa sama ada alamat emel anda adalah betul" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Sila pilihkan kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2488,39 +2558,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Sila masukkan pesanan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Sila masukkan nombor telefon anda" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Sila masukkan kata laluan" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Sila masukkan tajuk" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Silah masukkan emel yang benar" @@ -2529,55 +2607,62 @@ msgstr "Silah masukkan emel yang benar" msgid "Please enter a valid email address" msgstr "Sila masukkan alamat emel yang benah" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Sila masukkan nombor telefon anda" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Sila masukkan perincian" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Sila masukkan emel anda" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Sila masukkan alamat emel anda" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Sila masukkan nama pertama anda" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Sila masukkan nama anda" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Sila masukkan nombor telefon anda" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Sila masukkan nama kedua anda" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Sila masukkan tajuk anda" @@ -2626,7 +2711,11 @@ msgstr "" msgid "Please note:" msgstr "Sila nota:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +msgid "Please provide a duplicate ID or public update for this report." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2666,6 +2755,11 @@ msgstr "" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Sila tuliskan pesanan" @@ -2675,7 +2769,7 @@ msgid "Please write your update here" msgstr "Sila tuliskan kemas kini anda di sini" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Post" @@ -2684,15 +2778,15 @@ msgstr "Post" msgid "Posted anonymously at %s" msgstr "Post tanpa nama pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Dipostkan oleh %s pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Dipostkan oleh %s (%s) pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Dipostkan oleh %s pada %s" @@ -2704,11 +2798,11 @@ msgstr "" msgid "Previous" msgstr "Sebelumnya" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2725,7 +2819,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Peribadi" @@ -2749,21 +2843,21 @@ msgstr "Masalah %s dipastikan" msgid "Problem %s sent to council %s" msgstr "Masalah %s dihantar kepada majlis %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Pecahan masalah bagi negeri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Masalah ditanda sebagai terbukan" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Masalah-masalah" @@ -2790,7 +2884,7 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini" msgid "Problems within %.1fkm of %s" msgstr "Masalah dalam %.1fkm dalam lokasi ini" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2816,7 +2910,8 @@ msgstr "" msgid "Property address:" msgstr "Alamat bangunan" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Sediakan kemas kini" @@ -2825,12 +2920,12 @@ msgstr "Sediakan kemas kini" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2843,12 +2938,12 @@ msgstr "" msgid "Public response:" msgstr "Tindak balas awam:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Terbitkan foto" @@ -2903,7 +2998,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2928,7 +3023,7 @@ msgstr "Feed RSS untuk kemas kini bagi masalah ini" msgid "Receive email when updates are left on this problem." msgstr "Terima emel semasa kemas kini ditinggalkan bagi masalah ini" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2942,7 +3037,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Masalah yang dilaporkan baru-baru ini" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2964,9 +3059,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2974,12 +3069,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3008,11 +3107,11 @@ msgstr "" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3027,17 +3126,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "" @@ -3051,27 +3150,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3080,8 +3179,8 @@ msgstr "" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3089,10 +3188,9 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "" @@ -3108,7 +3206,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3120,7 +3218,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3174,21 +3272,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3207,17 +3306,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -3227,21 +3326,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3252,12 +3351,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3276,7 +3375,7 @@ msgstr "" msgid "Search Users" msgstr "" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "" @@ -3287,6 +3386,7 @@ msgid "Search:" msgstr "" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3299,7 +3399,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3308,8 +3408,8 @@ msgstr "" msgid "Select a body" msgstr "Pilihkan badan" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Pilihkan kawasan" @@ -3329,11 +3429,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Dihantar kepada %s %s kemudian" @@ -3342,11 +3447,11 @@ msgid "Sent:" msgstr "Dihantar:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Servis:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3355,9 +3460,9 @@ msgid "Share" msgstr "Kongsi" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3365,19 +3470,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3385,40 +3490,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Tunjukkan nama aku secara umum" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Tunjukkan lama" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Tunjukkan pin" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3429,12 +3531,16 @@ msgstr "Log masuk" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Log masuk atau daftarkan akaun" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Log keluar" @@ -3450,7 +3556,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "" @@ -3463,15 +3569,19 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3504,20 +3614,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Tarikh bermula:" #: templates/web/base/admin/body.html:73 @@ -3527,15 +3638,18 @@ msgstr "Tarikh bermula:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Negeri" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 msgid "State changed to:" msgstr "" @@ -3548,17 +3662,19 @@ msgstr "" msgid "State:" msgstr "Negeri:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Negeri" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Stats" @@ -3568,7 +3684,7 @@ msgstr "Stats" msgid "Status" msgstr "Status" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Masuk dibuka, melalui soalan selidik, %s" @@ -3581,7 +3697,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Subkategori: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Subkategori: %s" @@ -3598,18 +3719,19 @@ msgstr "Tajuk" msgid "Subject:" msgstr "Tajuk:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Hantar" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3651,7 +3773,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3659,25 +3781,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Ringkasan" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Laporan ringkasan" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Laporan ringkasan" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Hasil Kajian" @@ -3685,14 +3813,14 @@ msgstr "Hasil Kajian" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Teks" @@ -3700,7 +3828,7 @@ msgstr "Teks" msgid "Text only version" msgstr "Versi teks sahaja" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3727,7 +3855,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" @@ -3743,7 +3871,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3753,11 +3881,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "" @@ -3789,8 +3917,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3823,8 +3951,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "" @@ -3866,7 +3994,7 @@ msgstr "" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3891,7 +4019,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3902,33 +4030,37 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3936,7 +4068,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "" @@ -3991,26 +4123,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4027,7 +4167,7 @@ msgstr "Masalah ini belum diselesai" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4037,23 +4177,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Laporan ini menunggui sederhana." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Laporan ini ditanda sebagai ditutupi sekarang." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Laporan ini ditanda sebagai diselesai sekarang." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Laporan ini ditanda sebagai terbuka sekarang." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Laporan ini dikemukakan tanpa nama" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4064,7 +4204,7 @@ msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh penggu msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Garis masa" @@ -4076,20 +4216,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Tajuk" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" @@ -4101,44 +4242,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "Melihat lokasi tepat atas peta bagi isu ini" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Jumlah" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Jumlah" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4151,18 +4284,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Cuba lagi" @@ -4177,7 +4311,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4186,15 +4324,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Belum dipastikan" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Tidak diketahui" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Jenis pemberitahuan tak diketahui" @@ -4204,13 +4338,14 @@ msgstr "Jenis pemberitahuan tak diketahui" msgid "Unknown error" msgstr "Ralat tidak diketahui" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "ID masalah tidak diketahui" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4235,12 +4370,12 @@ msgstr "Kemaskini di bawah ditambahkan tanpa nama pada %s" msgid "Update below added by %s at %s" msgstr "Kemaskini di bawah ditambah oleh %s pada %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Kemas kini badan" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Pecahan kemaskini mengikuti negeri" @@ -4248,16 +4383,16 @@ msgstr "Pecahan kemaskini mengikuti negeri" msgid "Update by {{name}}" msgstr "Kemas kini dengan {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Kemas kini mengubahi keadaan masalah kepada %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Kemas kini menanda masalah sebagai diselesai" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Kemas kini masalah dibuka semula" @@ -4271,20 +4406,20 @@ msgstr "Status kemas kini" msgid "Updated" msgstr "Dikemas kinikan" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Dipostkan oleh %s (%s) pada %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Dipostkan oleh %s pada %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4292,7 +4427,7 @@ msgid "Updated!" msgstr "Dikemas kinikan!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Kemas kini" @@ -4339,40 +4474,81 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Emel ditambahkan kepada senarai penyalahguna" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Emel telah dalam senarai penyalahguna" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Tanda pengguna dipadam" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Pengguna ditanda" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "Dalam table penyalahguna?" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Pengguna" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Pengguna" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Nilai dikemaskinikan" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Alamat emel anda" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Nombor telefon anda" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4394,12 +4570,7 @@ msgstr "Melihat lokasi" msgid "Viewing a problem" msgstr "Melihat masalah" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4409,20 +4580,24 @@ msgstr "Kawasan pentadbiran majlis ini" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Kita mendapati lebih daripada satu bersesuaian bagi lokasi tersebut. Kita menunjukkan sehingga sepuluh bersesuaian, sila cuba dengan carian lain jika carian anda tidak didapati di sini. " +msgid "We found more than one match for that location." +msgstr "" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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" @@ -4430,6 +4605,12 @@ msgstr "Kita sedar bahawa masalah ini mungkin tanggungjawab %s; tetapi, pada mas msgid "We send it to the council on your behalf" msgstr "Kita menghantar kepada majlis bagi pihak anda" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Kita mendapati lebih daripada satu bersesuaian bagi lokasi tersebut. Kita menunjukkan sehingga sepuluh bersesuaian, sila cuba dengan carian lain jika carian anda tidak didapati di sini. " + #: 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." @@ -4439,8 +4620,8 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4468,7 +4649,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4491,6 +4672,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4507,16 +4692,7 @@ msgstr "" msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Tahun" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4531,7 +4707,7 @@ msgstr "Tahun" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Ya" @@ -4544,7 +4720,7 @@ msgstr "Ya aku ada kata laluan" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4561,7 +4737,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4587,7 +4763,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4595,7 +4771,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "Anda menolak; sila isikan kotak di atas" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4622,18 +4798,38 @@ msgstr "Anda telah dilog keluarkan" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Anda telah menunjukkan masalah pada titik atas peta yang ditanda pin hijau. Jika lokasi ini tidak betul, sila klik atas peta lagi." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Anda telah berjaya memastikan alamat emel anda." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Anda telah berjaya memastikan alamat emel anda." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Anda telah berjaya memastikan alamat emel anda." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Anda telah berjaya memastikan alamat emel anda." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Anda telah berjaya log masuk; sila semak dan pastikan maklumat anda adalah tepat: " -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Anda telah berjaya memastikan alamat emel anda." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4660,36 +4856,43 @@ msgid "Your Reports" msgstr "Laporan Anda" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Emel Anda" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Alamat emel anda" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Alamat emel anda" + #: 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" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4700,19 +4903,19 @@ msgstr "Nama anda" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4723,8 +4926,8 @@ msgstr "Kata laluan anda" msgid "Your password has been changed" msgstr "Kata laluan anda telah diubahi" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Nombor telefon anda" @@ -4733,7 +4936,7 @@ msgstr "Nombor telefon anda" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Laporan anda" @@ -4742,25 +4945,40 @@ msgstr "Laporan anda" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Kata laluan anda telah diubahi" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Kemas kini anda" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4777,8 +4995,8 @@ msgstr "majlis" msgid "didn't use map" msgstr "tidak mengguna peta" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "seperti ‘%s’ atau ‘%s’" @@ -4801,23 +5019,24 @@ msgstr "kemaskini yang lepas %s" msgid "less than a minute" msgstr "kurang dari seminit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "tiada" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "ditanda sebagai bukan tanggungjawab majlis" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "atau mengesan aku secara automatik" @@ -4858,7 +5077,7 @@ msgstr "pin tidak ditunjukkan sebab pengguna tidak menggunakan peta" msgid "this location" msgstr "Melihat lokasi" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "jenis masalah tempatan ini" @@ -4866,11 +5085,11 @@ msgstr "jenis masalah tempatan ini" msgid "today" msgstr "hari ini" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4878,14 +5097,24 @@ msgstr "" msgid "used map" msgstr "peta diguna" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "pengguna adalah dari majlis yang sama dengan masalah - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "pengguna adalah pemilik masalah" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Emel telah dalam senarai penyalahguna" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Emel ditambahkan kepada senarai penyalahguna" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4939,31 +5168,31 @@ msgid "%d year" msgid_plural "%d years" msgstr[0] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5023,6 +5252,39 @@ msgid "report" msgid_plural "reports" msgstr[0] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(Emel dalam jadual penyalahguna)" + +#~ msgid "By Date" +#~ msgstr "Dengan Tarikh" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Klik sini atau masukkan sebagai dd/mm/yyyy" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Laporan disahkan antara %s dan %s" + +#~ msgid "Hide old" +#~ msgstr "Sembunyikan lama" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Termasuk laporan yang belum disahkan" + +#~ msgid "Invalid end date" +#~ msgstr "Tarikh berakhir yang tak sah" + +#~ msgid "Invalid start date" +#~ msgstr "Tarikh mula yang tak sah" + +#~ msgid "No council" +#~ msgstr "Tiada majlis" + +#~ msgid "Show old" +#~ msgstr "Tunjukkan lama" + +#~ msgid "Year" +#~ msgstr "Tahun" + #~ msgid "%s ward, %s" #~ msgstr "%s kawasan pentadbiran, %s" @@ -5053,9 +5315,6 @@ msgstr[0] "" #~ msgid "No further action" #~ msgstr "Tidak dapat diselesai" -#~ msgid "Not Responsible" -#~ msgstr "Tidak Bertanggungjawab" - #~ msgid "Or problems reported to:" #~ msgstr "Atau masalah dilaporkan kepada:" diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po index 9e59c53881f..83b7b1330e6 100644 --- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Burmese (Myanmar) (https://www.transifex.com/mysociety/teams/12067/my_MM/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "ႏွင့္" @@ -32,6 +32,10 @@ msgstr "ႏွင့္" msgid " or " msgstr "သို႔မဟုတ္" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%s မွ %d ကိုျပင္ဆင္ခဲ့သည္" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%ေကာင္စီအဆက္အသြယ္ – %s အတည္ျပဳျပီးျပီ %sအတည္မျပဳရေသး" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s တိုက္ရိုက္အသစ္ရယူျခင္:" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s စစ်တမ်းမေးခွန်းလွှာပို့ပြီး – %s အဖြေ (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s စစ်တမ်းမေးခွန်းလွှာပို့ msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(ရိုင္းစိုင္းစြာေျပာသည့္ဇယားတြင္ရွိအီးေမးလ္)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(ဂရပ္ဖီတီ၊ စည္းကမ္းမဲ့ အမိႈ္က္စြန္႔ပစ္ျခင္း၊ လမ္းေဘးပလက္ေဖာင္းအုတ္ခဲမ်ားက်ိဳးပဲ့မႈ သို႔မဟုတ္ လမ္းမီးမလာျခင္းကဲ့သို႔)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -161,8 +165,8 @@ msgstr "(ႏွစ္ခုလံုးသို႔ပို႔မည္)" msgid "(we also have RSS feeds for problems within %s)" msgstr "%s အတြင္းရိွ ျပႆနာမ်ား၏ RSS feed" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- ေခါင္းစဥ္တစ္ခုေရြးပါ --" @@ -175,14 +179,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -191,16 +187,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -209,33 +205,52 @@ msgstr "" msgid "%s live problems" msgstr " %s ဘ၀ျပႆနာမ်ား" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "မဟုတ္ပါ ကၽြႏ္ုပ္၏အစီရင္ခံစာကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "မဟုတ္ပါ ကၽြႏ္ုပ္၏အစီရင္ခံစာကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "မဟုတ္ပါ ကၽြႏ္ုပ္၏အသစ္မြမ္းမံျခင္းကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "မဟုတ္ပါ ကၽြႏ္ုပ္၏အသစ္မြမ္းမံျခင္းကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "မဟုတ္ပါ အီးေမးလ္ျဖင့္၀င္မည္" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "မဟုတ္ပါ အီးေမးလ္ျဖင့္၀င္မည္" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "ဟုတ္ကဲ့ ကၽြႏ္ုပ္တြင္စကား၀ွက္တစ္ခုရွိသည္" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -249,11 +264,17 @@ msgid "Add a contact using the form below." msgstr "ေအာက္ပါပံုစံကိုသံုးျပီးအဆက္အသြယ္တစ္ခုထည့္မည္" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "စာကိုယ္ထည့္မည္" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "အီးေမးလ္လိပ္စာကိုပိ္တ္ပင္မည္" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -276,11 +297,17 @@ msgstr "ေခါင္းစဥ္အသစ္ထည့္မည္" msgid "Add option" msgstr "(ေရြးခ်ယ္ႏိုင္ခြင့္)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -290,23 +317,23 @@ msgstr "" msgid "Add user" msgstr "အသံုးျပဳသူထည့္မည္" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "%sကိုထည့္ျပီးျပီ" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -330,9 +357,10 @@ msgstr "အသိေပးခ်က္%dကိုပိတ္ထားသည္( msgid "Alert me to future updates" msgstr "ေနာက္ထပ္အသစ္မ်ားအတြက္လည္းကၽြႏ္ုပ္ကိုအသိေပးမည္" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -341,12 +369,13 @@ msgstr "" msgid "All Reports" msgstr "အစီရင္ခံစာအားလံုး" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -362,17 +391,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "အစီရင္ခံစာအားလံုး" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "%s ႏွင့္ %s ၾကားအစီရင္ခံစားအားလံုး" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -410,7 +439,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -421,7 +451,7 @@ msgstr "" msgid "Area covered" msgstr "ဧရိယာလႊမ္းျခံဳ ျခင္း" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -435,7 +465,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "တျခားေခါင္းစဥ္တစ္ခုသို႔ေျပာင္းလဲသတ္မွတ္မည္ -" @@ -447,7 +477,7 @@ msgstr "အပိုစာကိုယ္ကိုသတ္မွတ္မည္ msgid "Assign to subdivision:" msgstr "အေသးစိတ္နယ္နမိတ္သို႔သတ္မွတ္မည္-" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -463,12 +493,17 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "အခုေလာေလာဆယ္ အစီရင္ခံစာမ်ားကို ရွာေဖြျခင္း၊ၾကည့္ရႈျခင္းသာျပဳလုပ္ႏိုင္ေသးသည္" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "တာ၀န္ယူမႈမရွိျခင္း" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -476,18 +511,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -501,20 +528,21 @@ msgstr "စိစစ္ျခင္းကိုေစာင့္ဆိုင္ msgid "Back" msgstr "ေနာက္သို႔" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "အီးေမးလ္လိပ္စာကိုပိ္တ္ပင္မည္" +#, fuzzy +msgid "Ban user" +msgstr "သတ္မွတ္သည့္အသံုးျပဳသူ" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "စာကိုယ္မ်ား" @@ -525,14 +553,10 @@ msgstr "စာကိုယ္မ်ား" msgid "Body" msgstr "စာကိုယ္" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "စာကိုယ္ -" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "ေန႔စြဲအားျဖင့္" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -545,8 +569,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "ေျမပံုကိုမျမင္ဘူးလား။ ဒီအဆင့္ကိုေက်ာ္မည္ " -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -557,30 +582,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "အမ်ိဳးအစား" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "အမ်ိဳးအစား" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -588,17 +619,17 @@ msgstr "" msgid "Category:" msgstr "အမ်ိဳးအစား -" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "အမ်ိဳးအစား - %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -606,10 +637,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "စကား၀ွက္ေျပာင္းမည္" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "သင္၏ ဖုန္းနံပါတ္" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -631,19 +668,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "ဒီေနရာကိုႏွိပ္ပါ သို႔ dd/mm/yyyy ကဲ့သို႔ရိုက္ထည့္ပါ" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "ျပႆနာတစ္ခုကိုအစီရင္ခံစာတင္ရင္ေျမပံုကိုႏွိပ္ပါ" @@ -671,18 +703,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "ပိတ္မည္" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "ေကာင္စီမွပိတ္ထားသည္" @@ -697,16 +730,17 @@ msgid "Cobrand" msgstr "" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -714,7 +748,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "အစီအစဥ္သတ္မွတ္ျခင္း" @@ -723,7 +757,7 @@ msgstr "အစီအစဥ္သတ္မွတ္ျခင္း" msgid "Confirm" msgstr "အတည္ျပဳမည္" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "အေကာင့္ကိုအတည္ျပဳမည္" @@ -742,14 +776,10 @@ msgstr "အတည္ျပဳျခင္း" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "အတည္ျပဳခဲ့သည္" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "%s ႏွင့္ %s ၾကားအစီရင္ခံစာကိုအတည္ျပဳမည္" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -776,8 +806,8 @@ msgstr "အဖြဲ႕ႏွင့္ဆက္သြယ္ပါ" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "အသံုးျပဳသူရွာမေတြ႕ပါ" @@ -795,43 +825,16 @@ msgstr "ေကာင္စီ" msgid "Council contacts for %s" msgstr "%sအတြက္ေကာင္စီအဆက္အသြယ္" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "ေကာင္စီ ရည္ညႊန္းခ်က္" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "ေကာင္စီ-" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "အေရအတြက္" @@ -853,39 +856,44 @@ msgstr "အမ်ိဳးအစားဖန္တီးမည္" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "ဖန္တီးမည္" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "ဖန္တီးခဲ့ခ်ိန္-" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "ယခုအေျခအေန" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -896,14 +904,14 @@ msgstr "ယခုေလာေလာဆယ္ စာကိုယ္ ကိုမ msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -915,12 +923,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -931,8 +939,8 @@ msgstr "" msgid "Deleted" msgstr "ဖ်က္ျပီးျပီ" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -948,6 +956,10 @@ msgstr "ေဖာ္ျပခ်က္" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -960,6 +972,10 @@ msgstr "အေသးစိတ္အခ်က္အလက္" msgid "Details:" msgstr "အေသးစိတ္အခ်က္အလက္မ်ား-" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "တစ္ေယာက္မွတစ္ေယာက္လက္လြဲျခင္း" @@ -973,8 +989,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -983,7 +999,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -991,7 +1007,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1011,11 +1027,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1035,9 +1051,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "ျပင္ဆင္မည္" @@ -1047,33 +1064,33 @@ msgstr "ျပင္ဆင္မည္" msgid "Edit body details" msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "%dျပႆနာကိုျပင္ဆင္ေနသည္" @@ -1094,7 +1111,6 @@ msgstr "အယ္ဒီတာ" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1102,17 +1118,20 @@ msgstr "အယ္ဒီတာ" msgid "Email" msgstr "အီးေမးလ္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ထည့္ျပီး" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "စကား၀ွက္(ထည့္ခ်င္မွထည့္ပါ)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1121,19 +1140,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ရွိျပီး" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "အီးေမးလ္-" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "အီးေမးလ္ -%s" @@ -1146,16 +1164,17 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "ျပီးသည့္ရက္-" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1176,14 +1195,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "အနီးနားရွိ စာတိုက္နံပါတ္၊သို႔မဟုတ္လမ္းအမည္ႏွင့္ဧရိယာရိုက္ထည့္ပါ" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "အနီးနားရွိလမ္းအမည္ႏွင့္ဧရိယာကိုရိုက္ထည့္ပါ" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "စကား၀ွက္ရိုက္ထည့္ပါ" @@ -1201,8 +1220,8 @@ msgstr "ျပႆနာ၏အေသးစိတ္အခ်က္အလက္မ msgid "Error" msgstr "အမွားအယြင္း" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1227,7 +1246,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1243,7 +1262,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1255,7 +1274,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1267,7 +1286,7 @@ msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-" msgid "Extra data:" msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1297,21 +1316,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "ျပင္ျပီးျပီ" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "ျပင္ျပီးျပီ-ေကာင္စီ" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "ျပင္ျပီးျပီ-အသံုးျပဳသူ" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "ဖ်က္ျပီးျပီဟုသတ္မွတ္မည္" @@ -1319,7 +1339,7 @@ msgstr "ဖ်က္ျပီးျပီဟုသတ္မွတ္မည္" msgid "Flag user" msgstr "သတ္မွတ္သည့္အသံုးျပဳသူ" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "" @@ -1328,7 +1348,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "အမွတ္အသားျပဳလုပ္ထားသည့္ အသံုးျပဳသူမ်ားကို ေဖာ္ျပျခင္း" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1336,8 +1356,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "အမွတ္အသားျပဳလုပ္ထားျခင္း" @@ -1357,7 +1377,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1377,8 +1397,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "မၾကာခဏေမးေသာေမးခြန္းမ်ား" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1411,12 +1435,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "သြားမည္" @@ -1424,7 +1448,7 @@ msgstr "သြားမည္" msgid "Going to send questionnaire?" msgstr "စစ္တမ္းကိုပို႔ေတာ့မွာလား။" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1432,6 +1456,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "%s မွ" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "ဒီျပႆနာကိုေျဖရွင္းျပီးျပီလား" @@ -1452,21 +1485,26 @@ msgstr "အကူအညီ" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "မၾကာေသးခင္ကအနီးအနားက အစီရင္ခံစာမ်ား၏ဓာတ္ပံု" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "မဂၤလာပါ%s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "ေဖ်ာက္ထားေသာ" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1487,21 +1525,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "အေဟာင္းေဖ်ာက္ထားေသာ" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1513,7 +1548,7 @@ msgstr "" msgid "History" msgstr "ရာဇ၀င္" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "ပင္မ" @@ -1570,12 +1605,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1584,7 +1627,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1593,7 +1636,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1665,11 +1708,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1681,7 +1720,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1693,26 +1732,18 @@ msgstr "အတြင္းမွတ္စု" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "ပံုစံ %s သည္မမွန္ကန္ပါ" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "စမည့္ရက္မမွန္ကန္ပါ" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1731,7 +1762,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1756,12 +1787,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1787,18 +1813,14 @@ msgstr "" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1807,13 +1829,13 @@ msgstr "" msgid "List all reported problems" msgstr "အစီရင္ခံစာတင္ျပီးေသာျပႆနာစာရင္းအားလံုး" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "ဖြင့္ေနသည္" #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1845,12 +1867,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1858,11 +1883,11 @@ msgstr "" msgid "MAP" msgstr "ေျမပံု" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1874,11 +1899,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1898,45 +1923,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "လ" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1954,9 +1979,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1967,19 +1992,23 @@ msgstr "အမည္" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "အမည္-" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "အမည္ - %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1989,12 +2018,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2008,19 +2037,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "စာကိုယ္အသစ္ထည့္ျပီးျပီ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "ေခါင္းစဥ္အသစ္အဆက္အသြယ္ထည့္ျပီးျပီ" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2041,6 +2074,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "သင္၏ ဖုန္းနံပါတ္" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2070,18 +2108,19 @@ msgstr "" msgid "New reports" msgstr "အစီရင္ခံစာအသစ္မ်ား" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "ျမိဳ႕အသစ္" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2089,7 +2128,7 @@ msgstr "" msgid "Next" msgstr "ေနာက္သို႔" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2101,22 +2140,18 @@ msgstr "ေနာက္သို႔" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "မရွိပါ" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "စာကိုယ္မရွိ" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "ေကာင္စီမရွိ" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "မည္သည့္ေကာင္စီမွမေရြးရေသးပါ" @@ -2146,6 +2181,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "ရလဒ္မေတြ႕ပါ" @@ -2168,15 +2207,15 @@ msgstr "ေထာက္ပံ့ေပးမည့္သူမရွိပါ" msgid "None" msgstr "ဘာမွမဟုတ္" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2195,7 +2234,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "ကၽြႏ္ုပ္၏အေသးစိတ္နယ္နမိတ္အတြက္မဟုတ္ပါ" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "ယခင္ကအစီရင္မခံရေသး" @@ -2209,10 +2248,6 @@ msgstr "ေကာင္စီသို႔အစီရင္မခံရေသး msgid "Note" msgstr "မွတ္စု" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2240,37 +2275,46 @@ msgstr "ယခုသင္၏အစီရင္ခံစာကိုသြင္ msgid "Now to submit your update…" msgstr "" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "အိုေက" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "ျပည္နယ္အေဟာင္း" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2309,23 +2353,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "တျခား" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "အျခား ဧရိယာမ်ား" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2343,19 +2394,19 @@ msgstr "စာမ်က္ႏွာရွာမေတြ႕ပါ" msgid "Parent" msgstr "ပင္မ" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "တစ္၀က္" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "စကား၀ွက္(ထည့္ခ်င္မွထည့္ပါ)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "စကား၀ွက္-" @@ -2363,7 +2414,7 @@ msgstr "စကား၀ွက္-" msgid "Permalink" msgstr "အျမဲတမ္းလင့္ခ္" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2371,19 +2422,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "ဖုန္းနံပါတ္" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "ဖုန္းနံပါတ္(ထည့္ခ်င္မွထည့္ပါ)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "ဖုန္း-" @@ -2399,7 +2455,7 @@ msgstr "ဖုန္း-" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2425,12 +2481,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "မၾကာေသးခင္ကအနီးအနားက အစီရင္ခံစာမ်ား၏ဓာတ္ပံု" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "ေျမပံုတြင္ပင္တစ္ခုထားမည္" @@ -2452,25 +2513,34 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "စကား၀ွက္ကိုျပန္စစ္ေဆးျပီးျပန္ၾကိဳးစားပါ" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "သင္၏အီးေမးလ္လိပ္စာမွန္၊မမွန္ကိုစစ္ေဆးပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "သင္၏အီးေမးလ္လိပ္စာမွန္၊မမွန္ကိုစစ္ေဆးပါ" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "ေခါင္းစဥ္တစ္ခုကိုေရြးပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2485,39 +2555,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "စာတစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "သင္၏ဖုန္းနံပါတ္ကိုရိုက္ထည့္ပါ" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "စကား၀ွက္တစ္ခုရိုက္ထည့္ပါ" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "ေခါင္းစီးတစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "မွန္ကန္ေသာအီးေမးလ္တစ္ခုရိုက္ထည့္ပါ" @@ -2526,55 +2604,62 @@ msgstr "မွန္ကန္ေသာအီးေမးလ္တစ္ခုရ msgid "Please enter a valid email address" msgstr "မွန္ကန္ေသာအီးေမးလ္လိပ္စာတစ္ခုရိုက္ထည့္ပါ" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "သင္၏ဖုန္းနံပါတ္ကိုရိုက္ထည့္ပါ" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "တစ္ခ်ိဳ႕အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "သင္၏အီးေမးလ္ကိုရိုက္ထည့္ပါ" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "သင္၏အီးေမးလ္လိပ္စာကိုရိုက္ထည့္ပါ" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "သင္၏ပထမအမည္ကိုရိုက္ထည့္ပါ" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "သင္၏အမည္ကိုရိုက္ထည့္ပါ" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "သင္၏ဖုန္းနံပါတ္ကိုရိုက္ထည့္ပါ" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "သင္၏ဒုတိယအမည္ကိုရိုက္ထည့္ပါ" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "သင္၏ေခါင္းစဥ္ကိုရိုက္ထည့္ပါ" @@ -2623,7 +2708,12 @@ msgstr "" msgid "Please note:" msgstr "ေက်းဇူးျပဳျပီးမွတ္သားပါ-" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "သင္ဘာလို႔ဒီသတင္းပို႔ခ်က္ကိုျပန္ဖြင့္ရသလဲဆိုသည့္ရွင္းလင္းခ်က္ကိုေျပာျပေပးပါ" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2663,6 +2753,11 @@ msgstr "ျပႆနာေျဖရွင္းျပီးျပီ၊မရွ msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "စာတစ္ေၾကာင္းေရးပါ" @@ -2672,7 +2767,7 @@ msgid "Please write your update here" msgstr "သင္၏အသစ္မြမ္းမံမႈကိုဒီေနရာမွာေရးပါ" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "တင္မည္" @@ -2681,15 +2776,15 @@ msgstr "တင္မည္" msgid "Posted anonymously at %s" msgstr "%sမွာ အမည္မသိကဲ့သို႔တင္မည္" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "%s မွာ %s မွတင္ခဲ့သည္" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "%s မွာ %s(%s)မွတင္ခဲ့သည္" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "%s မွာ %sမွတင္ခဲ့သည္" @@ -2701,11 +2796,11 @@ msgstr "" msgid "Previous" msgstr "ယခင္က" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2722,7 +2817,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "ကိုယ္ပိုင္" @@ -2746,21 +2841,21 @@ msgstr "ျပႆနာ %s သည္အတည္ျဖစ္ခဲ့သည္" msgid "Problem %s sent to council %s" msgstr "ေကာင္စီ %s သို႔ ျပႆနာ %s ကိုပို႔လိုက္ပါျပီ" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "ျပည္နယ္မွ ျပႆနာကိုထပ္မံခြဲစိတ္လိုက္သည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "ျပႆနာကို ဖြင့္ထားသည္" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "စစ္ေဆးမႈရလဒ္မ်ားအေပၚတြင္ မူတည္ၿပီး ျပႆနာ အေျခအေန ေျပာင္းလဲသည္။" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "ျပႆနာမ်ား" @@ -2786,7 +2881,7 @@ msgstr "FixMyStreet ေပၚတြင္ လတ္တေလာ တင္ျပ msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2812,7 +2907,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" @@ -2821,12 +2917,12 @@ msgstr "" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "နာမည္ႏွင့္ စကားဝွက္ကို မထည့္သြင္းခ်င္လွ်င္ ရသည္။ နံပါတ္ႏွင့္ စကားဝွက္ ထည့္သြင္းပါက ျပႆနာမ်ားကို တင္ျပျခင္း၊ update မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "စကားဝွက္ကို မထည့္သြင္းခ်င္လွ်င္ ရသည္။ စကားဝွက္ ထည့္သြင္းပါက ျပႆနာမ်ားကို တင္ျပျခင္း၊ update မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။" @@ -2839,12 +2935,12 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "" @@ -2899,7 +2995,7 @@ msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရ msgid "RSS feed of nearby problems" msgstr "အနီးအနားရိွ ျပႆနာမ်ား၏ RSS feed" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2924,7 +3020,7 @@ msgstr "လက္ရိွ ျပႆနာကို update ျပဳလုပ္ msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2938,7 +3034,7 @@ msgstr "" msgid "Recently reported problems" msgstr "ျပႆနာမ်ားကို မၾကာေသးမီက အစီရင္ခံ တင္ျပၿပီး" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2960,9 +3056,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2970,12 +3066,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "ဓာတ္ပံု ဖယ္ရွားရန္ (မၿပီးေျမာက္ႏိုင္ပါ)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3004,11 +3104,11 @@ msgstr "" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3023,17 +3123,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "ေဒသတြင္း ျပႆနာမ်ားကို အစီရင္ခံျခင္း၊ ၾကည့္႐ႈျခင္းႏွင့္ ေဆြးေႏြးျခင္း" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "" @@ -3047,27 +3147,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3076,8 +3176,8 @@ msgstr "" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3085,10 +3185,9 @@ msgstr "" msgid "Reporting a problem" msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပျခင္း" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "" @@ -3104,7 +3203,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3116,7 +3215,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3170,21 +3269,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3203,17 +3303,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "ဘယ္ဘက္ကို လွည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "ညာဘက္ကို လွည့္ပါ" @@ -3223,21 +3323,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3248,12 +3348,12 @@ msgstr "ေျပာင္းလဲမႈမ်ားကို သိမ္း msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3272,7 +3372,7 @@ msgstr "အစီရင္ခံစာမ်ားကို ရွာေဖြ msgid "Search Users" msgstr "" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "အစီရင္ခံစာမ်ားကို ရွာေဖြရန္" @@ -3283,6 +3383,7 @@ msgid "Search:" msgstr "" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3295,7 +3396,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3304,8 +3405,8 @@ msgstr "" msgid "Select a body" msgstr "စာကိုယ္တစ္ခုကို ေရြးပါ။" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "ဧရိယာတစ္ခုကို ေရြးပါ။" @@ -3325,11 +3426,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "" @@ -3338,11 +3444,11 @@ msgid "Sent:" msgstr "" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3351,9 +3457,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3361,19 +3467,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3381,40 +3487,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3425,12 +3528,16 @@ msgstr "ဝင္ရန္" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "ဝင္ရန္ သို႔မဟုတ္ အေကာင့္တစ္ခု ဖန္တီးရန္" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -3446,7 +3553,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "" @@ -3459,15 +3566,19 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3500,20 +3611,20 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +msgid "Start Date" msgstr "" #: templates/web/base/admin/body.html:73 @@ -3523,15 +3634,18 @@ msgstr "" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "ေျပာင္းလဲမႈမ်ားကို သိမ္းဆည္းရန္" @@ -3545,16 +3659,18 @@ msgstr "ေျပာင္းလဲမႈမ်ားကို သိမ္း msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "" @@ -3564,7 +3680,7 @@ msgstr "" msgid "Status" msgstr "" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "" @@ -3577,7 +3693,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "အမ်ိဳးအစား" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "" @@ -3594,18 +3715,19 @@ msgstr "" msgid "Subject:" msgstr "" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3646,7 +3768,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3654,25 +3776,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "အက်ဥ္းခ်ဳပ္" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "အစီရင္ခံစာအက်ဥ္းခ်ဳပ္" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "အစီရင္ခံစာအက်ဥ္းခ်ဳပ္" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "စစ္တမ္းရလဒ္" @@ -3680,14 +3808,14 @@ msgstr "စစ္တမ္းရလဒ္" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "စာ" @@ -3695,7 +3823,7 @@ msgstr "စာ" msgid "Text only version" msgstr "စာဗားရွင္းသာ" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3722,7 +3850,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" @@ -3738,7 +3866,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3748,11 +3876,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "ထိုျပႆနာကိုယခုပင္ျပန္ပို႔ပါမည္" @@ -3784,8 +3912,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3818,8 +3946,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "ခ်ိဳ႕ယြင္းမႈမွာ - %s" @@ -3861,7 +3989,7 @@ msgstr "အသံုးျပဳသူမ်ားမွျပင္ျပီး msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3886,7 +4014,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3897,33 +4025,38 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "အီးေမးလ္ႏွင့္ လ်ွိဳ႕ဝွက္နံပါတ္တြင္ ျပႆနာ ျဖစ္ေပၚခဲ့ပါသည္။ သင္၏ လွ်ိဳ႕ဝွက္နံပါတ္ကို မမွတ္မိပါက သို႔မဟုတ္ မရိွေသးပါက ေလွ်က္လႊာ၏ \"အီးေမးလ္ျဖင့္ ဝင္ရန္\" ေနရာတြင္ ျဖည့္ပါ။" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "အီးေမးလ္ သို႔မဟုတ္ စကားဝွက္တြင္ ျပႆနာ ျဖစ္ေပၚခဲ့ပါသည္။ ျပန္လည္ ႀကိဳးစားပါ။" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "အီးေမးလ္ႏွင့္ လ်ွိဳ႕ဝွက္နံပါတ္တြင္ ျပႆနာ ျဖစ္ေပၚခဲ့ပါသည္။ သင္၏ လွ်ိဳ႕ဝွက္နံပါတ္ကို မမွတ္မိပါက သို႔မဟုတ္ မရိွေသးပါက ေလွ်က္လႊာ၏ \"အီးေမးလ္ျဖင့္ ဝင္ရန္\" ေနရာတြင္ ျဖည့္ပါ။" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3931,7 +4064,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "" @@ -3986,26 +4119,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "ဒီအခ်က္အလက္ ျဖည့္စြက္ရန္ လိုအပ္သည္" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4022,7 +4163,7 @@ msgstr "ဒီျပႆနာကိုမေျဖရွင္းရေသးပ msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4032,23 +4173,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "ဒီအစီရင္ခံစာသည္အတည္ျပဳျခင္းကိုေစာင့္ဆိုင္းေနဆဲျဖစ္သည္" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "ဒီျပႆနာကို ပိတ္ထားသည္ဟုေလာေလာဆယ္သတ္မွတ္ထားသည္" -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "ဒီျပႆနာကိုေလာေလာဆယ္ေျဖရွင္းျပီးျပီဟုသတ္မွတ္ထားသည္" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "ဒီအစီရင္ခံစာကိုယခုေလာေလာဆယ္ဖြင့္ထားသည္" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "ဒီအစီရင္ခံစာကိုအမည္မသိသူမွတင္သြင္းခဲ့သည္" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "ဒီ web စာမ်က္ႏွာသည္ အသံုးျပဳသူမွရိုက္ထားေသာ ျပႆနာ၏ဓာတ္ပံုတစ္ပံုပါ၀င္သည္" @@ -4059,7 +4200,7 @@ msgstr "ဒီ web စာမ်က္ႏွာသည္ အသံုးျပဳ msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4071,20 +4212,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "ျပည္တြင္း သတိေပးခ်က္မ်ား ေဖာ္ျပရန္အတြက္ သင္၏ စာတိုက္ေသတၲာအမွတ္ သို႔မဟုတ္ လမ္းနာမည္ႏွင့္ ဧရိယာကို ထည့္သြင္းပါ။" @@ -4096,44 +4238,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4146,18 +4280,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "" @@ -4172,7 +4307,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4181,15 +4320,11 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -4199,13 +4334,14 @@ msgstr "" msgid "Unknown error" msgstr "" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4230,12 +4366,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4243,16 +4379,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -4266,20 +4402,20 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "%s မွာ %s(%s)မွတင္ခဲ့သည္" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "%s မွာ %sမွတင္ခဲ့သည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4287,7 +4423,7 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" @@ -4334,40 +4470,81 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ထည့္ျပီး" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ရွိျပီး" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "သုံးစြဲသူ အမွတ္အသား ျပဳလုပ္ျခင္းကို ဖယ္ရွားလိုက္သည္။" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "သုုံးစြဲသူက အမွတ္အသား ျပဳလုပ္ျခင္း" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "(ရိုင္းစိုင္းစြာေျပာသည့္ဇယားတြင္ရွိအီးေမးလ္)" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "သုံးစြဲသူရွာေဖြမႈသည္ ၎တို႔၏ အီးေမးလိပ္စာႏွင့္ နာမည္မ်ားရွိ တူညီမႈမ်ားကို ေတြ႔ရွိႏိုင္သည္။ " -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "အသံုးျပဳသူမ်ား" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "အသံုးျပဳသူမ်ား" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "သင္၏ အီးေမးလ္လိပ္စာ" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "သင္၏ ဖုန္းနံပါတ္" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4389,12 +4566,7 @@ msgstr "တည္ေနရာကို စိစစ္ျခင္း" msgid "Viewing a problem" msgstr "ျပႆနာကို စိစစ္ျခင္း" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4404,20 +4576,24 @@ msgstr "ေကာင္စီအဖြဲ႔မ်ား" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "ယခုတည္ေနရာ အတြက္ တစ္ခုထက္ပိုသည့္ ေနရာမ်ား ေတြ႔ရွိထားပါသည္။ တူညီသည့္ ေနရာဆယ္ခုကို ေတြ႔ရွိထားပါသည္။ ယခုတည္ေနရာ မဟုတ္ပါက အျခားရွာေဖြမႈမ်ား ထပ္မံျပဳလုပ္ပါ။" +msgid "We found more than one match for that location." +msgstr "" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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; ၏တာဝန္ျဖစ္ေၾကာင္း သတိျပဳမိေသာ္လည္း မိမိတို႔တြင္ ၎တို႔ကို ဆက္သြယ္ရန္ အေသးစိတ္ မရွိေသးပါ။ အကယ္၍ သင့္ေတာ္သည့္ လိပ္စာရွိပါက ေက်းဇူးျပဳၿပီး ဆက္သြယ္ေပးပါ။" @@ -4425,6 +4601,12 @@ msgstr "မိမိတို႔သည္ %s; ၏တာဝန္ျဖစ္ေ msgid "We send it to the council on your behalf" msgstr "သင္၏ကိုယ္စား ေကာင္စီထံ ကၽြန္ေတာ္တို႔ ေပးပို႔ပါမည္" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4434,8 +4616,8 @@ msgstr "မိမိတို႔၏ privacy ေပၚလစီႏွင့္အ msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4463,7 +4645,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4488,6 +4670,10 @@ msgstr "" "ေတာင္းဆို ရွာေဖြမႈမ်ားႏွင့္ အတူ အုပ္ခ်ဳပ္ေရးတစ္ခုစီကို ေပးပို႔သည့္ ေတာင္းဆိုခ်က္မ်ားကို ကန္႔သတ္ရန္ ေအဂ်င္စီတာဝန္ အတြက္ရွာေဖြမႈမ်ားလည္း ျဖစ္\n" "ႏိုင္ေခ် ျဖစ္သည္။ ရွာေဖြမႈသည္ အုပ္ခ်ဳပ္ေရး အေထာက္အထားျဖစ္ၿပီး MaPit မွေထာက္ပံ့ ေပးထားသည္။" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4504,16 +4690,7 @@ msgstr "မက္ေဆ့ခ်္ တစ္ခုလုံးကို စာ msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "ခုႏွစ္" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4528,7 +4705,7 @@ msgstr "ခုႏွစ္" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "ဟုတ္သည္။" @@ -4541,7 +4718,7 @@ msgstr "ကၽြႏု္ပ္တြင္ စကားဝွက္တစ္ msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4558,7 +4735,7 @@ msgstr "သင့္အေနျဖင့္ ေစာ္ကားခံေန msgid "You can view the problem on this site." msgstr "သင့္အေနျဖင့္ ယခုဆိုက္တြင္ ျပႆနာကို ၾကည့္ရူႏိုင္သည္။" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "သင့္အေနျဖင့္ ယဥ္ေက်းမႈမရွိေသာ သုံးစြဲသူ၏ အီးေမးလ္ကို ၎တို႔ဖန္တီးထားေသာ အလိုအေလ်ာက္ ဖုံးထားေသာ(မေပးပို႔ေသာ) အစီရင္ခံစာမ်ား ျဖစ္သည့္ ယဥ္ေက်းမႈမရွိေသာ စာရင္းတြင္ ထည့္သြင္းထားႏိုင္သည္။" @@ -4584,7 +4761,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "ဆိုက္ေပၚတြင္ ရွိေနမေစခ်င္လွ်င္ ဖ်က္ထားေသာ အဖြဲ႔ကို အမွတ္အသား ျပဳလုပ္ႏိုင္သည္။" @@ -4592,7 +4769,7 @@ msgstr "ဆိုက္ေပၚတြင္ ရွိေနမေစခ်င msgid "You declined; please fill in the box above" msgstr "ျငင္းပယ္လိုက္သည္။ ေက်းဇူးျပဳ၍ အေပၚက အကြက္တြင္ ျဖည့္ေပးပါ။" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4624,18 +4801,38 @@ msgstr "" "ေျမပုံေပၚတြင္ အစိမ္းေရာင္ ပင္အပ္ ျဖင့္အမွတ္အသားျပဳထားသည့္ ေနရာတြင္ ျပႆနာကို ေတြ႔ႏိုင္သည္။ အကယ္၍ လက္ရွိတည္ေနရာမဟုတ္ပါက ေျမပုံကို\n" "ထပ္ႏွိပ္ပါ။" -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "သင္၏ အီးေမးလ္လိပ္စာကို ေအာင္ျမင္စြာ အတည္ျပဳၿပီး ျဖစ္သည္" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "သင္၏ အီးေမးလ္လိပ္စာကို ေအာင္ျမင္စြာ အတည္ျပဳၿပီး ျဖစ္သည္" +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "သင္၏ အီးေမးလ္လိပ္စာကို ေအာင္ျမင္စြာ အတည္ျပဳၿပီး ျဖစ္သည္" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "သင္၏ အီးေမးလ္လိပ္စာကို ေအာင္ျမင္စြာ အတည္ျပဳၿပီး ျဖစ္သည္" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "သင္ ေအာင္ျမင္စြာ ဝင္ေရာက္ႏိုင္ခဲ့ပါၿပီ။ သင္၏ အေသးစိတ္ အခ်က္အလက္ မွန္ကန္မႈ ရိွ မရိွ စစ္ေဆးၿပီး အတည္ျပဳပါ။" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "သင္၏ အီးေမးလ္လိပ္စာကို ေအာင္ျမင္စြာ အတည္ျပဳၿပီး ျဖစ္သည္" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4659,36 +4856,43 @@ msgid "Your Reports" msgstr "သင္၏ အစီရင္ခံစာမ်ား" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "သင္၏ အီးေမးလ္" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "သင္၏ အီးေမးလ္လိပ္စာ" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +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 "သင့္၏အခ်က္အလက္မ်ားကို ကၽြႏု္ပ္တို႔၏ သီးသန္႔တည္ရွိမႈ ေပၚလစီ ႏွင့္အညီ အသုံးျပဳသြားမည္ ျဖစ္သည္။" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4699,19 +4903,19 @@ msgstr "သင့္အမည္" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4722,8 +4926,8 @@ msgstr "သင္၏ စကားဝွက္" msgid "Your password has been changed" msgstr "သင္၏ စကားဝွက္ကို ေျပာင္းလဲၿပီးျဖစ္သည္" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "သင္၏ ဖုန္းနံပါတ္" @@ -4732,7 +4936,7 @@ msgstr "သင္၏ ဖုန္းနံပါတ္" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "သင္၏ အစီရင္ခံစာမ်ား" @@ -4741,25 +4945,40 @@ msgstr "သင္၏ အစီရင္ခံစာမ်ား" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "သင္၏ စကားဝွက္ကို ေျပာင္းလဲၿပီးျဖစ္သည္" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "သင္၏ မြမ္းမံျပင္ဆင္ထားမႈမ်ား" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4776,8 +4995,8 @@ msgstr "ေကာင္စီ" msgid "didn't use map" msgstr "ေျမပံု မသံုးခဲ့ပါ" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "ဥပမာ ‘%s’ သို႔မဟုတ္ ‘%s’" @@ -4800,23 +5019,24 @@ msgstr "ေနာက္ဆုံး ျပဳျပင္မြမ္းမံ msgid "less than a minute" msgstr "တစ္မိနစ္ခန္႔သာ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "မအားေသးပါ" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "ေကာင္စီ၏ တာဝန္မဟုတ္ေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "သို႔မဟုတ္ အလိုအေလ်ာက္ လမ္းညႊန္ပါ" @@ -4857,7 +5077,7 @@ msgstr "အသုံးျပဳသူ မသုံးသည့္ ေျမပ msgid "this location" msgstr "တည္ေနရာကို စိစစ္ျခင္း" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "ေဒသတြင္း ျပႆနာသာျဖစ္သည္။" @@ -4865,11 +5085,11 @@ msgstr "ေဒသတြင္း ျပႆနာသာျဖစ္သည္။" msgid "today" msgstr "ယေန႔" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4877,14 +5097,24 @@ msgstr "" msgid "used map" msgstr "ေျမပံု အသံုးျပဳထားၿပီး" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "အသုံးျပဳသူသည္ တူညီသည့္ ေကာင္စီမွျဖစ္လွ်င္ ျပႆနာျဖစ္သည္။" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "အသုံးျပဳသူပ ျပႆနာပိုင္ရွင္ ျဖစ္သည္" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ရွိျပီး" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ထည့္ျပီး" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4938,31 +5168,31 @@ msgid "%d year" msgid_plural "%d years" msgstr[0] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5022,6 +5252,30 @@ msgid "report" msgid_plural "reports" msgstr[0] "" +#~ msgid "By Date" +#~ msgstr "ေန႔စြဲအားျဖင့္" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "ဒီေနရာကိုႏွိပ္ပါ သို႔ dd/mm/yyyy ကဲ့သို႔ရိုက္ထည့္ပါ" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "%s ႏွင့္ %s ၾကားအစီရင္ခံစာကိုအတည္ျပဳမည္" + +#~ msgid "Hide old" +#~ msgstr "အေဟာင္းေဖ်ာက္ထားေသာ" + +#~ msgid "Invalid end date" +#~ msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ" + +#~ msgid "Invalid start date" +#~ msgstr "စမည့္ရက္မမွန္ကန္ပါ" + +#~ msgid "No council" +#~ msgstr "ေကာင္စီမရွိ" + +#~ msgid "Year" +#~ msgstr "ခုႏွစ္" + #~ msgid "%s ward, %s" #~ msgstr "%sရပ္ကြက္၊ %s" @@ -5043,9 +5297,6 @@ msgstr[0] "" #~ msgid "Investigating" #~ msgstr "စံုစမ္းစစ္ေဆးေနဆဲ" -#~ msgid "Not Responsible" -#~ msgstr "တာ၀န္ယူမႈမရွိျခင္း" - #~ msgid "Or problems reported to:" #~ msgstr "သို႔မဟုတ္ ျပႆနာမ်ားကိုတင္ျပရန္ေနရာမွာ-" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index 157f954ab17..3f35f6b8120 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/mysociety/teams/12067/nb_NO/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr " og " @@ -32,6 +32,10 @@ msgstr " og " msgid " or " msgstr " eller " +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d redigeringer av %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s administrasjonskontakter – %s bekreftet, %s ubekreftet" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -74,7 +78,7 @@ msgstr "" "innen en angitt distanse fra en bestemt posisjon." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -87,6 +91,11 @@ msgstr "" msgid "%s live updates" msgstr "%s aktive oppdateringer" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s spørreskjema sendt – %s besvart (%s%%)" @@ -95,7 +104,7 @@ msgstr "%s spørreskjema sendt – %s besvart (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© OpenStreetMap -bidragsytere" @@ -103,11 +112,6 @@ msgstr "© OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(Feil & lokasjon for feil)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Epost i misbrukstabellen)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -143,7 +147,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -165,8 +169,8 @@ msgstr "(sendt til begge)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS-strøm for problemer innenfor %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" @@ -179,14 +183,6 @@ msgstr "--Velg en mal--" msgid "10 inch pothole on Example St, near post box" msgstr "20 cm dypt hull i Eksempelveien, nær postboks" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -195,17 +191,17 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "MAPIT_URL er satt (%s) men ingen MAPIT_TYPES.
Dette er antagelig hvorfor \"dekket område\" er tom (under).
Kanskje du skal legge til noen MAPIT_TYPES i konfigurasjonsfilen?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -214,33 +210,52 @@ msgstr "" msgid "%s live problems" msgstr "%s aktive problemer" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Nei La meg bekrefte min rapport med e-post" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Nei La meg bekrefte min rapport med e-post" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Nei La meg bekrefte min oppdatering med e-post" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Nei La meg bekrefte min oppdatering med e-post" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Nei, la meg logge inn med e-post:" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Nei, la meg logge inn med e-post:" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 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." -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Ja, jeg har et passord" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -254,11 +269,17 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Legg til administrasjon" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Bannlys epostadresse" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -281,11 +302,17 @@ msgstr "Legg til ny kategori" msgid "Add option" msgstr "valgfri" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Uten telefonnummer)" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "Legg i hurtiglisten" @@ -295,23 +322,23 @@ msgstr "Legg i hurtiglisten" msgid "Add user" msgstr "Legg til bruker" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "Legg til / endre problemkategorier" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "Legg til / endre responsprioriteter" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "Legg til / endre responsmaler" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "La til %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 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" @@ -335,9 +362,10 @@ msgstr "Varsel %d koblet ut (opprettet %s)" msgid "Alert me to future updates" msgstr "Send meg varsel ved fremtidige oppdateringer" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -346,12 +374,13 @@ msgstr "" msgid "All Reports" msgstr "Alle rapporter" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Alle rapporter som CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Alle kategorier" @@ -367,17 +396,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alle rapporter" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Alle rapporter mellom %s og %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -415,7 +444,8 @@ 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:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Er du sikker?" @@ -426,7 +456,7 @@ msgstr "Er du sikker?" msgid "Area covered" msgstr "Dekket område" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "Område:" @@ -440,7 +470,7 @@ msgid "Assign to competent body:" msgstr "Tildel til kompetent administrasjon:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Flytt til en annen kategori:" @@ -452,7 +482,7 @@ msgstr "Tildel til ekstern administrasjon:" msgid "Assign to subdivision:" msgstr "Tildelt underavdeling:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "Tilordne brukere til områder" @@ -468,12 +498,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 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." -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Auto-svar:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "Auto-svar:" @@ -481,18 +516,10 @@ msgstr "Auto-svar:" msgid "Available categories" msgstr "Tilgjengelige kategorier" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "Unngå personlig informasjon og bilnummerskilt" @@ -506,20 +533,21 @@ msgstr "Avventer moderasjon" msgid "Back" msgstr "Tilbake" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "Tilbake til alle rapporter" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Bannlys epostadresse" +#, fuzzy +msgid "Ban user" +msgstr "Flag bruker" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Administrasjoner" @@ -530,14 +558,10 @@ msgstr "Administrasjoner" msgid "Body" msgstr "Administrasjon" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Administrasjon:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "På dato" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -550,8 +574,9 @@ 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:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Kategorier" @@ -562,30 +587,36 @@ msgstr "Kategorier:" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategori" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategori endret fra '%s' til '%s'" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -593,17 +624,18 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategori: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "Endre epost" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "Endre epostadresse" @@ -611,10 +643,16 @@ msgstr "Endre epostadresse" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Bytt passord" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Uten telefonnummer)" + #: templates/web/base/admin/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." @@ -641,19 +679,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Klikk her eller tast inn dato på formatet dd/mm/åååå" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klikk i kartet for å rapportere et problem" @@ -682,18 +715,19 @@ msgstr "Klikk lenken i bekreftelses-eposten for å logge inn." #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" @@ -708,16 +742,17 @@ msgid "Cobrand" msgstr "Merkevaresamarbeid" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Merkevaresamarbeidsdata:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -725,7 +760,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Oppsett" @@ -734,7 +769,7 @@ msgstr "Oppsett" msgid "Confirm" msgstr "Bekreft" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Bekreft konto" @@ -753,14 +788,10 @@ msgstr "Bekreftelse" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Bekreftet" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Bekreftede rapporter mellom %s og %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -787,8 +818,8 @@ msgstr "Kontakt prosjektgruppen" msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -806,43 +837,16 @@ msgstr "Administrasjon" msgid "Council contacts for %s" msgstr "Administrasjonskontakter for %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "administrasjonsreferanse: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Administrasjon:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Antall" @@ -864,40 +868,45 @@ msgstr "Lag kategori" msgid "Create priority" msgstr "Opprett prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "Opprett rapporter/oppdateringer på vegne av en bruker" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "Opprett rapporter/oppdateringer som myndigheten" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "Opprett rapporter/oppdateringer på vegne av en bruker" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Lag mal" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Opprettet" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Opprettet:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Gjeldende tilstand" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -908,14 +917,14 @@ msgstr "I øyeblikket er ikke laget noen instanser." msgid "Customer not contactable" msgstr "Kunden kan ikke kontaktes" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Oversikt" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Behandlet av underavdeling innen 5 arbeidsdager" @@ -928,12 +937,12 @@ msgstr "" msgid "Default priority" msgstr "Opprett prioritet" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Slett mal" @@ -944,8 +953,8 @@ msgstr "Slett mal" msgid "Deleted" msgstr "Slettet" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -961,6 +970,10 @@ msgstr "Beskrivelse" msgid "Description:" msgstr "Beskrivelse:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -973,6 +986,10 @@ msgstr "Detaljer" msgid "Details:" msgstr "Detaljer:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Delegert" @@ -986,8 +1003,8 @@ msgstr "Brukte ikke kart" msgid "Diligency prize league table" msgstr "Arbeidshester" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -996,7 +1013,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Ikke send epostvarsel på innhentede kommentarer til den som opprettet problemet" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1004,7 +1021,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:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1024,11 +1041,11 @@ msgstr "" 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:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1051,9 +1068,10 @@ msgstr "Øst/Nord:" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Rediger" @@ -1063,33 +1081,33 @@ msgstr "Rediger" msgid "Edit body details" msgstr "Rediger detaljer for administrasjon" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "Endre andre brukeres detaljer" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "Endre andre brukeres rettigheter" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "Endre rapportkategori" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "Endre rapportprioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "Endre rapporter" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Rediger problem %d" @@ -1110,7 +1128,6 @@ msgstr "Oppdatert av" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1118,17 +1135,20 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Epost lagt til misbruksliste" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "Epostadresse" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Epostadresse" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Epostvarsel laget" @@ -1137,19 +1157,18 @@ msgstr "Epostvarsel laget" msgid "Email alert deleted" msgstr "Epostvarsel slettet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Epost allerede i misbrukslisten" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "E-post: %s" @@ -1165,8 +1184,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/body-form.html:123 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" @@ -1176,8 +1195,9 @@ 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Slutt-dato:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1198,14 +1218,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Skriv inn et veinavn og sted" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Skriv inn et nytt passord" @@ -1223,8 +1243,8 @@ msgstr "Legg inn detaljer om problemet" msgid "Error" msgstr "Feil" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Alt" @@ -1249,7 +1269,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "Forklar hva som er galt" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1265,7 +1285,7 @@ msgstr "Ekstern" msgid "External ID" msgstr "Ekstern ID" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "Ekstern URL" @@ -1277,7 +1297,7 @@ msgstr "Ekstern administrasjon" msgid "External team" msgstr "Eksternt lag" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1289,7 +1309,7 @@ msgstr "Ekstra detaljer" msgid "Extra data:" msgstr "Ekstra data:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "Ekstra detaljer" @@ -1319,21 +1339,22 @@ msgstr "Fiks dette ved å velge en area covered i Edit bod #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Løst" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Løst - Administrasjon" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Løst - Bruker" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Merk som slettet" @@ -1341,7 +1362,7 @@ msgstr "Merk som slettet" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Flagget" @@ -1350,7 +1371,7 @@ msgstr "Flagget" msgid "Flagged reports and users" msgstr "Flaggede rapporter og brukere" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Flaggede brukere er listet opp på flaggede-siden." @@ -1358,8 +1379,8 @@ msgstr "Flaggede brukere er listet opp på flaggede-siden." msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Flagget:" @@ -1379,7 +1400,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "For mer informasjon, se Hvordan FixMyStreet bruker Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1399,8 +1420,12 @@ msgstr "Ønsket er sendt videre til ekstern administrasjon" msgid "Frequently Asked Questions" msgstr "Ofte spurte spørsmål" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1433,12 +1458,12 @@ msgstr "Glad for å høre at det er i orden!" #: 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Fortsett" @@ -1446,7 +1471,7 @@ msgstr "Fortsett" msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "Gi tilgang til administratoren" @@ -1454,6 +1479,15 @@ 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/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "av %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Har dette problemet blitt løst?" @@ -1474,21 +1508,26 @@ msgstr "Hjelp" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "Hjelp %s å løse problemet ditt fortere, ved å oppgi noen ekstra detaljer. Denne ekstra informasjonen vil ikke bli publisert på nettsiden." +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Bilder av nye problemer i nærheten" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hei, %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjul" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1509,21 +1548,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Skjul gamle" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1535,7 +1571,7 @@ msgstr "" msgid "History" msgstr "Historie" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Hjem" @@ -1592,12 +1628,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 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." @@ -1606,7 +1650,7 @@ msgstr "Hvis du får mer informasjon om status for problemet ditt, vær så snil 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." -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Hvis du vil at denne malen skal være et valg for spesielle kategorier, velg dem her. Som standard vil de vises for alle kategorier." @@ -1615,7 +1659,7 @@ msgstr "Hvis du vil at denne malen skal være et valg for spesielle kategorier, msgid "If you submit a problem here the problem will not be reported to the council." msgstr "Hvis du legger inn en rapport her vil ikke rapporten bli sendt til administrasjonen." -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1694,11 +1738,7 @@ msgstr "Tom innboks, her kommer vi!" msgid "Include reporter personal details" msgstr "Inkluder rapportørens personlige detaljer" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Inkluder ubekreftede problemer" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" @@ -1710,7 +1750,7 @@ msgstr "" msgid "Inspection required" msgstr "Trenger inspeksjon" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "Instruer underleverandør til å fikse problemer" @@ -1722,26 +1762,18 @@ msgstr "Interne notater" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Ugyldig slutt-dato" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 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." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Ugyldig startdato" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "Det er ofte raskest å sjekke FAQ-en vår og se om svaret er der." @@ -1760,7 +1792,7 @@ msgstr "Ukjent område" msgid "Jurisdiction unknown" msgstr "Ukjent område" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1785,12 +1817,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1816,18 +1843,14 @@ msgstr "Siste oppdatering:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "Minst nylig oppdatert" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1836,13 +1859,13 @@ msgstr "" msgid "List all reported problems" msgstr "List alle rapporterte problemer" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Laster..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1874,12 +1897,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1887,11 +1913,11 @@ msgstr "" msgid "MAP" msgstr "KART" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "Administrer hurtigliste" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1903,11 +1929,11 @@ msgstr "Kart" msgid "Mark as sent" msgstr "Marker som sendt" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 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:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1927,45 +1953,45 @@ msgstr "Melding til ekstern administrasjon:" msgid "Missing bodies:" msgstr "Manglende administrasjoner:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "Moderer" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "Moderer detaljer i rapprten" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "Moderer denne rapporten" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Moderert av avdeling innen en arbeidsdag" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Måned" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "Mest kommentert" @@ -1983,9 +2009,9 @@ msgstr "Mest kommentert" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1996,19 +2022,24 @@ msgstr "Navn" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Navn:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Navn: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "Naviger til dette problemet" +#: templates/web/base/report/_inspect.html:39 +#, fuzzy +msgid "Nearest calculated address:" +msgstr "Ny epostadresse:" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2018,12 +2049,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2039,20 +2070,25 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 #, fuzzy msgid "New" msgstr "Nyeste" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Ny administrasjon lagt til" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "Ny epostadresse:" @@ -2073,6 +2109,11 @@ msgstr "Nytt notat til DM:" msgid "New password:" msgstr "Nytt passord:" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Uten telefonnummer)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2102,18 +2143,19 @@ msgstr "Nye rapporter innenfor grensen til {{NAME}} på FiksGataMi" msgid "New reports" msgstr "Nye rapporter" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Ny tilstand" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Ny mal" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "Nyeste" @@ -2121,7 +2163,7 @@ msgstr "Nyeste" msgid "Next" msgstr "Neste" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2133,22 +2175,18 @@ msgstr "Neste" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Nei" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Intet område" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Ingen administrasjon" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Ingen administrasjon" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -2178,6 +2216,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Ingen resultater returnert" @@ -2203,8 +2245,8 @@ msgstr "Ingen støttespillere" msgid "None" msgstr "Ingen" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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." @@ -2212,8 +2254,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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2236,7 +2278,7 @@ msgstr "Kan ikke kontaktes" msgid "Not for my subdivision" msgstr "Ikke for min underavdeling" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Ikke rapportert tidligere" @@ -2250,10 +2292,6 @@ msgstr "Ikke rapportert til administrasjonen" msgid "Note" msgstr "Merk" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Merk at når vi tar med ubekreftede rapporter så brukes datoen rapporten var opprettet, hvilket ikke trenger være den samme måneden som rapporten var bekreftet, så tallene kan hoppe litt opp og ned." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2281,37 +2319,46 @@ msgstr "På tide å sende din rapport…" msgid "Now to submit your update…" msgstr "På tide å registrere din oppdatering…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Gammel tilstand" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "Eldste" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2351,23 +2398,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Annet" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "andre områder:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2385,19 +2439,19 @@ msgstr "Fant ikke siden" msgid "Parent" msgstr "Forelder" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Passord (valgfritt)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Passord:" @@ -2405,7 +2459,7 @@ msgstr "Passord:" msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "Rettigheter:" @@ -2414,19 +2468,25 @@ msgstr "Rettigheter:" msgid "Phone Reporter:" msgstr "Rapportert:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Rapportert:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2442,7 +2502,7 @@ msgstr "Telefon:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2468,12 +2528,17 @@ msgstr "Bilder" msgid "Photos of recent nearby reports" msgstr "Bilder av nye problemer i nærheten" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Plasser tegnestiften på kartet" @@ -2495,25 +2560,34 @@ msgstr "Vær høflig, poengtert og kortfattet." msgid "Please check the passwords and try again" msgstr "Vennligst sjekk passordene og prøv igjen" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Husk å rette opp feilene nedenfor." @@ -2531,39 +2605,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Vennligst legg til en melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Legg inn ditt telefonnummer." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "Vennligst skriv et navn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "Vennligst legg inn et navn for administrasjonen" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Skriv inn et passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Legg til en gyldig e-post" @@ -2572,55 +2654,62 @@ msgstr "Legg til en gyldig e-post" msgid "Please enter a valid email address" msgstr "Legg inn din e-post" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Legg inn ditt telefonnummer." + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Legg inn din e-post" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Vennligst tast inn din e-postadresse" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Vennligst tast inn ditt fornavn" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Legg inn ditt navn" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Legg inn ditt telefonnummer." -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Vennligst tast inn ditt mellomnavn" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Vennligst legg inn din tittel" @@ -2671,7 +2760,12 @@ msgstr "Merk at din oppdatering enda ikke har blitt sendt." msgid "Please note:" msgstr "Vennligst merk deg:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Vennligst bidra med en offentlig oppdatering for denne rapporten." + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "Vennligst bidra med en offentlig oppdatering for denne rapporten." @@ -2711,6 +2805,11 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" msgid "Please upload an image only" msgstr "Vennligst last opp kun bilder" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Skriv inn en melding" @@ -2720,7 +2819,7 @@ msgid "Please write your update here" msgstr "Vennligst skriv inn din oppdatering her" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Send inn" @@ -2729,15 +2828,15 @@ msgstr "Send inn" msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Lagt inn av %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Lagt inn av %s %s" @@ -2749,11 +2848,11 @@ msgstr "Drevet av Fi msgid "Previous" msgstr "Forrige" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "Prioriteter" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "Prioritet" @@ -2770,7 +2869,7 @@ msgstr "Personvern og cookies" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privat" @@ -2794,21 +2893,21 @@ msgstr "Problem %s bekreftet" msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problem markert som åpent." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Problemtilstandsendring basert på spørreundersøkelsesresultater" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemer" @@ -2835,7 +2934,7 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi" msgid "Problems within %.1fkm of %s" msgstr "Problemer innenfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2861,7 +2960,8 @@ msgstr "Problemer innenfor %s, %s" msgid "Property address:" msgstr "Eiendomsadresse:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidra med en oppdatering" @@ -2870,12 +2970,12 @@ msgstr "Bidra med en oppdatering" msgid "Provide update as" msgstr "Legg inn oppdatering som" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valgfritt å oppgi navn og passord, men hvis du gjør det kan du enklere rapportere problemer, legge igjen oppdateringer og håndtere rapportene dine." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valgfritt å oppgi et passord, men hvis du gjør det vil det bli enklere for deg å rapportere problemer, legge inn oppdateringer og holde oversikt over dine rapporter" @@ -2888,12 +2988,12 @@ msgstr "" msgid "Public response:" msgstr "Offentlig respons:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "Offentlig oppdatering:" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Publiser bilde" @@ -2948,7 +3048,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2973,7 +3073,7 @@ msgstr "RSS-strøm med oppdateringer for dette problemet" msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringer på dette problemet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "Mottatt av %s øyeblikk senere" @@ -2987,7 +3087,7 @@ msgstr "Nylige lokale problemer, %s" msgid "Recently reported problems" msgstr "Nylig meldte problemer" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "Nylig oppdatert" @@ -3011,9 +3111,9 @@ msgstr "Fjern flagg" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "Fjern fra hurtiglisten" @@ -3021,12 +3121,16 @@ msgstr "Fjern fra hurtiglisten" msgid "Remove from site" msgstr "Fjern fra nettsiden" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilde (kan ikke gjøres om!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "Svar til bruker:" @@ -3055,11 +3159,11 @@ msgstr "Rapporter misbruk" msgid "Report as" msgstr "Rapporter som" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Rapport på %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3074,17 +3178,17 @@ msgstr "Rapporter problemet ditt" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problemer" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -3098,27 +3202,27 @@ msgstr "Rapportert av:" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -3127,8 +3231,8 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reported:" msgstr "Rapportert:" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3136,10 +3240,9 @@ msgstr "Rapportert:" msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Rapporter" @@ -3156,7 +3259,7 @@ msgstr "Rapporter som venter på godkjenning" msgid "Reports by destination" msgstr "Publisert av %s %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 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." @@ -3168,7 +3271,7 @@ msgstr "" msgid "Reports published" msgstr "Publiserte rapporter" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3224,21 +3327,22 @@ msgid "Response Templates" msgstr "Responsmaler" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "Svarmaler for %s" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3257,17 +3361,17 @@ 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:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Roter til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Roter til høyre" @@ -3277,21 +3381,21 @@ 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:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelitt" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3302,12 +3406,12 @@ msgstr "Lagre endringer" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3326,7 +3430,7 @@ msgstr "Søk i rapporter" msgid "Search Users" msgstr "Søk i brukere" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Søk i rapporter" @@ -3337,6 +3441,7 @@ msgid "Search:" msgstr "Søk:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Søket fant ingen rapporter." @@ -3349,7 +3454,7 @@ msgstr "Søket fant ingen brukere." msgid "See our privacy policy" msgstr "Se personvernreglene våre" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3358,8 +3463,8 @@ msgstr "" msgid "Select a body" msgstr "Velg en administrasjon" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Velg et område" @@ -3379,11 +3484,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "Rapport sendt tilbake" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" @@ -3392,11 +3502,11 @@ msgid "Sent:" msgstr "Sendt:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Tjeneste:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "Sett til nåværende plassering" @@ -3405,9 +3515,9 @@ msgid "Share" msgstr "Dele" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "Hurtigliste" @@ -3415,19 +3525,19 @@ msgstr "Hurtigliste" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "I hurtiglisten" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "I hurtiglisten til %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3435,40 +3545,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Vis mitt navn offentlig" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Vis gamle" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Vis nåler" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3479,12 +3586,17 @@ msgstr "Logg inn" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Logg inn med epost is tedet, og oppgi et nytt passord. Når du besøker lenken du fikk i epost vil passordet ditt bli oppdatert." +#: templates/web/base/auth/general.html:96 +#, fuzzy +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "Logg inn med epost is tedet, og oppgi et nytt passord. Når du besøker lenken du fikk i epost vil passordet ditt bli oppdatert." + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Logg inn eller opprett en konto" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Logg ut" @@ -3503,7 +3615,7 @@ msgstr "" " for å indikere at rapportene blir sendt\n" "fra din FiksGataMi installasjon." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Noen bilder av nylig meldte problemer" @@ -3516,15 +3628,20 @@ msgstr "Noe tekst å oversette" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "Beklager, det var ikke en gyldig lenke" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "Beklager, det var ikke en gyldig lenke" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3557,20 +3674,21 @@ 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:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "Sorter etter" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 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:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "Personale:" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Start-dato:" #: templates/web/base/admin/body.html:73 @@ -3580,15 +3698,18 @@ msgstr "Start-dato:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Tilstand" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Lagre endringer" @@ -3602,17 +3723,19 @@ msgstr "Lagre endringer" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Tilstand" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistikk" @@ -3622,7 +3745,7 @@ msgstr "Statistikk" msgid "Status" msgstr "Status" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Fortsatt åpen via spørreskjema, %s" @@ -3635,7 +3758,12 @@ msgstr "Gatevisning" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Underkategori: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Underkategori: %s" @@ -3652,18 +3780,19 @@ msgstr "Emne" msgid "Subject:" msgstr "Emne:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Send inn" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3705,7 +3834,7 @@ msgstr "Oppsummer problemet" msgid "Summarise your changes" msgstr "Oppsummer dine endringer" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3713,25 +3842,31 @@ msgstr "Oppsummer dine endringer" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Oppsummering" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Oppsummeringsrapporter" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "Superbruker:" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "Superbrukere har tilgang til å utføre alle handlinger i admingrensesnittet." -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Resultater fra spørreundersøkelsen" @@ -3739,14 +3874,14 @@ msgstr "Resultater fra spørreundersøkelsen" msgid "Template «%s»" msgstr "Mal «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Maler" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -3754,7 +3889,7 @@ msgstr "Tekst" msgid "Text only version" msgstr "Tekst-versjon" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3781,7 +3916,7 @@ msgstr "Tusen takk for din henvendelse" msgid "Thank you for your feedback" msgstr "Takk for din tilbakemelding" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Takk for at du lastet opp ditt bilde. Vi må nå plassere ditt problem, så vær så snill å skrive inn navnet på en vei eller et postnummer i området i boksen ovenfor :" @@ -3797,7 +3932,7 @@ msgstr "Bildet ser ikke ut til å ha blitt lastet opp riktig (%s), prøv på nyt 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen." @@ -3807,11 +3942,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Det problemer har blitt markert som sendt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." @@ -3849,8 +3984,8 @@ 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3891,8 +4026,8 @@ msgstr "" 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:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3934,7 +4069,7 @@ msgstr "De siste problemer rapportert fikset av brukere" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "De siste problemer innenfor grensen til {{NAME}} rapportert av brukere" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 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." @@ -3959,7 +4094,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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" @@ -3972,33 +4107,38 @@ msgstr "" "Brukerens navn vises offentlig på rapporter som ikke er markert med anonym.\n" "Navn er ikke nødvendigvis unike." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Det er ingen rapporter å vise." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Det var problemer med din e-post/passord-kombinasjon. Hvis du har glemt ditt passord, eller hvis du ikke har et, vennligst fyll inn «Logg inn via e-post»-delen av skjemaet" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Det var problemer med din epost/passord-kombinasjon. Vær så snill å forsøke igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Det var problemer med din e-post/passord-kombinasjon. Hvis du har glemt ditt passord, eller hvis du ikke har et, vennligst fyll inn «Logg inn via e-post»-delen av skjemaet" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 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." @@ -4006,7 +4146,7 @@ msgstr "Det var problemer med din oppdatering. Vær så snill å forsøke igjen msgid "There were problems with your report. Please see below." msgstr "Det var problemer med din rapport. Vennligst se under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." @@ -4070,26 +4210,34 @@ 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:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Denne informasjonen er påkrevd" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Dette er et utviklernettsted. Ting kan knekke når som helst og databasen vil bli periodisk slettet." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "Det har vært et hull i veien i to måneder og..." @@ -4106,7 +4254,7 @@ msgstr "Dette problemet har ikke blitt løst" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4116,23 +4264,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Denne rapporten avventer moderasjon" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tiden markert som lukket." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tiden markert som fikset." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Denne rapporten ble rapportert anonymt" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4143,7 +4291,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4155,20 +4303,21 @@ msgstr "Tips for perfekte bilder" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Tittel" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Tittel:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "Du finner lokale problemer ved å søke på ditt postnummer eller veinavn og sted" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted" @@ -4180,44 +4329,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 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." -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Totalt" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Totalt" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "Trafikkstyring kreves?" @@ -4230,18 +4371,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "Klarert av administrasjoner:" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 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:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "Klarert:" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Prøv igjen" @@ -4256,7 +4398,11 @@ msgstr "Forsøk å sende epost direkte til oss:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4265,15 +4411,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Ubekreftet" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "uløste rapporter" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Ukjent" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Ukjent varsel-type" @@ -4283,13 +4425,14 @@ msgstr "Ukjent varsel-type" msgid "Unknown error" msgstr "Ukjent feil" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Ukjent problem-Id" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4314,12 +4457,12 @@ msgstr "Oppdateringen under lagt inn anonymt %s" msgid "Update below added by %s at %s" msgstr "Oppdateringen under lagt til av %s %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Oppdater administrasjon" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Tilstandsfordeling for oppdateringer" @@ -4327,16 +4470,16 @@ msgstr "Tilstandsfordeling for oppdateringer" msgid "Update by {{name}}" msgstr "Oppdatert av {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "En oppdatering endret problemets status til %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "En oppdatering markerte dette problemet som fikset." -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "En oppdatering gjennåpnet problemet" @@ -4350,20 +4493,20 @@ msgstr "Oppdater tilstanden" msgid "Updated" msgstr "Oppdatert" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Lagt inn av %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Lagt inn av %s %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4371,7 +4514,7 @@ msgid "Updated!" msgstr "Oppdatert!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Oppdateringer" @@ -4418,40 +4561,81 @@ msgstr "Brukte kart" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Epost lagt til misbruksliste" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Epost allerede i misbrukslisten" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Bruker flagget" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "I misbrukstabell?" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Brukersøk leter etter treff gjennom brukernavn og epostadresser. " -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Brukere" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Brukere" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 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:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Verdier oppdatert" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Ny epostadresse:" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Ditt telefonnummer" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4473,12 +4657,7 @@ msgstr "Ser på et sted" msgid "Viewing a problem" msgstr "Ser på et problem" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4488,20 +4667,25 @@ msgstr "Bydeler innenfor denne administrasjonen" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Vi fant mer en ett treff for den plassen. Vi viser opp til ti treff, så forsøk et annet søk hvis din plass ikke er her." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Vi fant mer enn et treff for problemreferansen:" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "Vi fant mer enn et treff for problemreferansen:" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 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:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4509,6 +4693,12 @@ msgstr "Vi innser at %s kan være ansvarlig for dette problemet, men vi mangler msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegne" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Vi fant mer en ett treff for den plassen. Vi viser opp til ti treff, så forsøk et annet søk hvis din plass ikke er her." + #: 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." @@ -4518,8 +4708,8 @@ msgstr "Vi vil kun bruke personlige informasjon om deg i henhold til våre MaPit." msgstr "Når du søker etter forespørsler, så er det også mulig å søke etter agency_responsible for å begrense det til forespørsler som er sendt til en enkelt adminstrasjon. Søketermen er administrasjons-IDen som oppgitt av MaPit." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "Kunne du tenke deg å bidra til FiksGataMi? Kildekoden vår er fri programvare og tilgjengelig via fixmystreet.org." @@ -4586,16 +4780,7 @@ msgstr "Når du skriver meldingen din med kun store bokstaver blir den vanskelig msgid "Wrong location? Just click again on the map." msgstr "Feil sted? Bare klikk på nytt i kartet." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "År" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4610,7 +4795,7 @@ msgstr "År" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Ja" @@ -4623,7 +4808,7 @@ msgstr "Ja, jeg har et passord" 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:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4640,7 +4825,7 @@ msgstr "Du rapporterer at følgende oppdatering er støtende, inneholder personl 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:96 +#: templates/web/base/admin/user-form.html:114 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." @@ -4668,7 +4853,7 @@ 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:93 +#: templates/web/base/admin/body-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." @@ -4676,7 +4861,7 @@ msgstr "Du kan markere en administrasjon som slettet hvis du ikke vil at den ska msgid "You declined; please fill in the box above" msgstr "Du avviste; vennligst fyll inn boksen ovenfor" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4703,18 +4888,38 @@ msgstr "Du er allerede logget ut" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Du har plassert problemet ved punktet i kartet som er markert med en grønn nål. Hvis dette ikke er korrekt plassering kan du klikke i kartet på nytt." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Du har nå lykkes med å bekrefte din e-postadresse." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Du har nå lykkes med å bekrefte din e-postadresse." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Du har nå lykkes med å bekrefte din e-postadresse." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Du har nå lykkes med å bekrefte din e-postadresse." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har lykkes med å logge inn. Vennligst sjekk og bekreft at dine detaljer er korrekte:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Du har nå lykkes med å bekrefte din e-postadresse." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Du har ikke laget en rapport ennå. Rapporter et problem nå." @@ -4740,36 +4945,43 @@ msgid "Your Reports" msgstr "Dine rapporter" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "Din konto" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Din e-post" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Din e-postadresse" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Din e-postadresse" + #: 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." -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4780,19 +4992,19 @@ msgstr "Ditt navn" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4803,8 +5015,8 @@ msgstr "Ditt passord" msgid "Your password has been changed" msgstr "Ditt passord har blitt endret" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Ditt telefonnummer" @@ -4813,7 +5025,7 @@ msgstr "Ditt telefonnummer" msgid "Your report" msgstr "Din rapport" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Dine oppdateringer" @@ -4822,25 +5034,40 @@ msgstr "Dine oppdateringer" msgid "Your shortlist" msgstr "Din hurtigliste" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Ditt passord har blitt endret" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Dine oppdateringer" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "Deg" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "alle" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4857,8 +5084,8 @@ msgstr "administrasjon" msgid "didn't use map" msgstr "brukte ikke kart" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "for eksempel «%s» eller «%s»" @@ -4881,23 +5108,24 @@ msgstr "sist oppdatert %s" msgid "less than a minute" msgstr "mindre enn et minutt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "ingen" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "markert som ikke administrasjonens ansvar" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "eller finn min posisjon automatisk" @@ -4938,7 +5166,7 @@ msgstr "Det vises ingen nål på grunn av at brukeren ikke brukte kartet" msgid "this location" msgstr "Ser på et sted" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "denne type lokalt problem" @@ -4946,11 +5174,11 @@ msgstr "denne type lokalt problem" msgid "today" msgstr "idag" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4958,14 +5186,24 @@ msgstr "" msgid "used map" msgstr "brukte kart" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "bruker er fra samme administrasjon som problemet - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "bruker er eier av problemet" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Epost allerede i misbrukslisten" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Fjern fra hurtiglisten" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5027,35 +5265,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5125,6 +5363,45 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(Epost i misbrukstabellen)" + +#~ msgid "By Date" +#~ msgstr "På dato" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Klikk her eller tast inn dato på formatet dd/mm/åååå" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Bekreftede rapporter mellom %s og %s" + +#~ msgid "Hide old" +#~ msgstr "Skjul gamle" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Inkluder ubekreftede problemer" + +#~ msgid "Invalid end date" +#~ msgstr "Ugyldig slutt-dato" + +#~ msgid "Invalid start date" +#~ msgstr "Ugyldig startdato" + +#~ msgid "No council" +#~ msgstr "Ingen administrasjon" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Merk at når vi tar med ubekreftede rapporter så brukes datoen rapporten var opprettet, hvilket ikke trenger være den samme måneden som rapporten var bekreftet, så tallene kan hoppe litt opp og ned." + +#~ msgid "Show old" +#~ msgstr "Vis gamle" + +#~ msgid "Unfixed reports" +#~ msgstr "uløste rapporter" + +#~ msgid "Year" +#~ msgstr "År" + #~ msgid "" #~ "%s sends different categories of problem\n" #~ "to the appropriate council, so problems within the boundary of a particular council\n" diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po index a0af0b4befd..91c78bc467c 100644 --- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Dutch (Netherlands) (https://www.transifex.com/mysociety/teams/12067/nl_NL/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "en" @@ -32,6 +32,10 @@ msgstr "en" msgid " or " msgstr "of" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d bewerkingen door %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s contactpersonen overheid – %s geverifieerd, %s ongeverifieerd" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "%s heeft diverse RSS feeds en e-mail meldingen voor lokale problemen zoals meldingen voor problemen in bepaalde wijken of gemeentes, of alle problemen binnen een bepaalde straal." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "%s heeft diverse RSS feeds en e-mail meldingen voor lokale problemen zoa msgid "%s live updates" msgstr "%s live updates" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s vragenlijsten verzonden – %s beantwoord (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s vragenlijsten verzonden – %s beantwoord (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "&Rechten; OpenStreetMap bijdragende partijen" @@ -99,11 +108,6 @@ msgstr "&Rechten; OpenStreetM msgid "(Defect & location of defect)" msgstr "(Defect & en locatie van het defect)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Email in misbruiktabel)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(zoals graffiti, zwerfafval, losliggende tegels of straatverlichting) " -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -161,8 +165,8 @@ msgstr "(verstuurd naar beide)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS feed van problemen binnen %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Kies een categorie --" @@ -175,14 +179,6 @@ msgstr "--Kies een website indeling--" msgid "10 inch pothole on Example St, near post box" msgstr "Een 25 cm diep gat op voorbeeldstraat bij de brievenbus" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -194,16 +190,16 @@ msgstr "" "Dit is waarschijnlijk de reden dat het \"bestreken gebied\" leeg is (zie beneden).
\n" "Misschien moeten er MAPIT_TYPES toegevoegd worden aan het configuratie bestand?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -212,33 +208,52 @@ msgstr "" msgid "%s live problems" msgstr "%s actieve problemen" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Nee Laat me mijn melding per e-mail bevestigen" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Nee Laat me mijn melding per e-mail bevestigen" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Nee Laat me mijn update per e-mail bevestigen" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Nee Laat me mijn update per e-mail bevestigen" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Nee Laat me inloggen per e-mail" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Nee Laat me inloggen per e-mail" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 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." -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Jameta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -550,8 +574,9 @@ 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:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Categoriën" @@ -562,30 +587,36 @@ msgstr "Categoriën:" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Categorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Categorie" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Categorie veranderd van '%s' in '%s'" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -593,17 +624,18 @@ msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud" msgid "Category:" msgstr "Categorie:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Categorie: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "Verander email" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "Verander emailadres" @@ -611,10 +643,16 @@ msgstr "Verander emailadres" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Verander Wachtwoord" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Niet opgegeven)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -636,19 +674,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Klik hier of geef de datum in dd/mm/yyyy formaat" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klik op de kaart om een probleem te melden" @@ -677,18 +710,19 @@ msgstr "Klik op de link in onze bevestigingsemail om in te loggen." #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Gesloten" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Gesloten door gemeente" @@ -703,16 +737,17 @@ msgid "Cobrand" msgstr "Cobrand" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Cobrand data:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -720,7 +755,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuratie" @@ -729,7 +764,7 @@ msgstr "Configuratie" msgid "Confirm" msgstr "Bevestig" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Bevestig account" @@ -748,14 +783,10 @@ msgstr "Bevestiging" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Bevestigd" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -782,8 +813,8 @@ msgstr "Neem contact op met het team" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Kan de gebruiker niet vinden" @@ -801,43 +832,16 @@ msgstr "Gemeente" msgid "Council contacts for %s" msgstr "Gemeente contactpersongen voor %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "gemeente ref.: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Gemeente:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Aantal" @@ -859,39 +863,44 @@ msgstr "Maak een categorie" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Maak een sjabloon" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Aangemaakt" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Aangemaakt:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Huidige status" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -902,14 +911,14 @@ msgstr "" msgid "Customer not contactable" msgstr "Klant kan niet bereikt worden" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Dashboard" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Door een afdeling behandeld binnen 5 werkdagen" @@ -921,12 +930,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Verwijder sjabloon" @@ -937,8 +946,8 @@ msgstr "Verwijder sjabloon" msgid "Deleted" msgstr "Verwijderd" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -954,6 +963,10 @@ msgstr "Beschrijving" msgid "Description:" msgstr "Beschrijving:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -966,6 +979,10 @@ msgstr "Details" msgid "Details:" msgstr "Details:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Overgedragen" @@ -979,8 +996,8 @@ msgstr "Kaart niet gebruikt" msgid "Diligency prize league table" msgstr "Toewijdingsranglijst" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -989,7 +1006,7 @@ 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" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -997,7 +1014,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:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1017,11 +1034,11 @@ msgstr "" 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:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1041,9 +1058,10 @@ msgstr "Oostwaarde/Noordwaarde" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Bewerk" @@ -1053,33 +1071,33 @@ msgstr "Bewerk" msgid "Edit body details" msgstr "Wijzig openbaar lichaam details" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Bewerk melding %d" @@ -1100,7 +1118,6 @@ msgstr "Redacteur" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1108,17 +1125,20 @@ msgstr "Redacteur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Email toegevoegd aan zwarte lijst" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Wachtwoord (optioneel)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1127,19 +1147,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Email staat al op zwarte lijst" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "" @@ -1152,17 +1171,18 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" -msgstr "" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" +msgstr "Op datum" #: templates/web/base/admin/open311-form-fields.html:21 msgid "Endpoint" @@ -1182,14 +1202,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Geef dichtstbijzijnde postcode, of straatnaam en plaats" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Geef dichtstbijzijnde straatnaam en plaats" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Geef wachtwoord " @@ -1207,8 +1227,8 @@ msgstr "Geef details van het probleem" msgid "Error" msgstr "Foutmelding" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1233,7 +1253,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1249,7 +1269,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1261,7 +1281,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1273,7 +1293,7 @@ msgstr "Extra info:" msgid "Extra data:" msgstr "Extra info:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1303,21 +1323,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Opgelost" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Opgelost - Gemeente" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Opgelost - Gebruiker" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "" @@ -1325,7 +1346,7 @@ msgstr "" msgid "Flag user" msgstr "Gemarkeerde gebruikr" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Gemarkeerd" @@ -1334,7 +1355,7 @@ msgstr "Gemarkeerd" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1342,8 +1363,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Gemarkeerd:" @@ -1363,7 +1384,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1383,8 +1404,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Veelgestelde Vragen" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1417,12 +1442,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Gaan" @@ -1430,7 +1455,7 @@ msgstr "Gaan" msgid "Going to send questionnaire?" msgstr "Vragenlijst versturen?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1438,6 +1463,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Grafiek van problemen aangemaakt per status na verloop van tijd" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "door %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Is dit probleem opgelost?" @@ -1458,21 +1492,26 @@ msgstr "Help" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Foto's van recente meldingen dichtbij" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hoi %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Verborgen" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1493,21 +1532,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Verberg oud" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Verberg spelden" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1519,7 +1555,7 @@ msgstr "" msgid "History" msgstr "Geschiedenis" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "" @@ -1576,12 +1612,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1590,7 +1634,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1599,7 +1643,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1671,11 +1715,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Ongeverifiëerde meldingen meesturen" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Ongeldige has_photo waarde \"%s\"" @@ -1687,7 +1727,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1699,26 +1739,18 @@ msgstr "Interne notities" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Ongeldige agency_responsible waarde %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Ongeldige einddatum" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Ongeldig formaat %s gespecifieerd" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Ongeldige startdatum" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1737,7 +1769,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1762,12 +1794,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1793,18 +1820,14 @@ msgstr "Laatste update:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1813,13 +1836,13 @@ msgstr "" msgid "List all reported problems" msgstr "Toon alle meldingen" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Laden..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1851,12 +1874,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1864,11 +1890,11 @@ msgstr "" msgid "MAP" msgstr "Kaart" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1880,11 +1906,11 @@ msgstr "Kaart" msgid "Mark as sent" msgstr "Markeren als verzonden" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1904,45 +1930,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Vermiste jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Maand" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1960,9 +1986,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1973,19 +1999,23 @@ msgstr "Naam" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Naam:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Naam: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1995,12 +2025,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2016,19 +2046,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Nieuw contactpersonen voor categorie toegevoegd" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2049,6 +2083,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Niet opgegeven)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2078,18 +2117,19 @@ msgstr "Nieuwe problemen binnen de grenzen van {{NAME}} op FixMyStreet" msgid "New reports" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Nieuwe status" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2097,7 +2137,7 @@ msgstr "" msgid "Next" msgstr "Volgende" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2109,22 +2149,18 @@ msgstr "Volgende" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Nee" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Geen gemeente" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Geen gemeente geselecteerd" @@ -2154,6 +2190,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "" @@ -2176,15 +2216,15 @@ msgstr "Geen medestanders" msgid "None" msgstr "Geen" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2203,7 +2243,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Nog niet gemeld" @@ -2217,10 +2257,6 @@ msgstr "Niet gemeld bij de gemeente" msgid "Note" msgstr "Opmerking" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Let op dat als je onbevestigde meldingen meeneemt we de datum gebruiken waarop de melding is gemaakt, dit kan afwijken van de maand waarin de melding is bevestigd dus dan kunnen de cijfers afwijken." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2248,37 +2284,46 @@ msgstr "Nu om je melding te verzend…" msgid "Now to submit your update…" msgstr "Nu om je update te verzend…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Oude status" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2317,23 +2362,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Anders" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "Anders" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2351,19 +2403,19 @@ msgstr "Pagina Niet Gevonden" msgid "Parent" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Gedeeltelijk" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Wachtwoord (optioneel)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Wachtwoord:" @@ -2371,7 +2423,7 @@ msgstr "Wachtwoord:" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2380,19 +2432,25 @@ msgstr "" msgid "Phone Reporter:" msgstr "Gemeld:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Telefoonnummer (optioneel)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Gemeld:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefoonnummer:" @@ -2408,7 +2466,7 @@ msgstr "Telefoonnummer:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2434,12 +2492,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Foto's van recente meldingen dichtbij" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "" @@ -2461,25 +2524,34 @@ msgstr "Wees beleefd, precies en beknopt" msgid "Please check the passwords and try again" msgstr "Controleer de wachtwoorden en probeer opnieuw" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Controleer of je e-mailadres klopt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Controleer of je e-mailadres klopt" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Kies een categorie" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2494,39 +2566,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Geef bericht in" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Geef bericht in" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Geef wachtwoord" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Geef onderwerp" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Geef een geldig e-mailadres" @@ -2535,55 +2615,62 @@ msgstr "Geef een geldig e-mailadres" msgid "Please enter a valid email address" msgstr "Geef een geldig e-mailadres" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Geef een geldig e-mailadres" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Geef details" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Geef een geldig e-mailadres" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Geef een geldig e-mailadres" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Geef je voornaam" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Geef je naam" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Geef je tweede naam" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Geef je titel" @@ -2632,7 +2719,12 @@ msgstr "" msgid "Please note:" msgstr "Let op:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Geef een reden op waarom je deze melding heropent" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2672,6 +2764,11 @@ msgstr "Geef aan of het probleem is verholpen" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Schrijf een bericht" @@ -2681,7 +2778,7 @@ msgid "Please write your update here" msgstr "Schrijf je update hier" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Bericht" @@ -2690,15 +2787,15 @@ msgstr "Bericht" msgid "Posted anonymously at %s" msgstr "Anoniem geplaatst bij %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Geplaatst door %s bij %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Geplaatst door %s (%s) bij %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Geplaatst door %s bij %s" @@ -2710,11 +2807,11 @@ msgstr "" msgid "Previous" msgstr "Vorige" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2731,7 +2828,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privé" @@ -2755,21 +2852,21 @@ msgstr "Probleem %s bevestigd" msgid "Problem %s sent to council %s" msgstr "Probleem %s verzonden naar gemeente %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Probleem verdeeld per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Probleem gemarkeerd als open" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Probleem status gewijzigd op basis van onderzoeksresultaten" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemen" @@ -2796,7 +2893,7 @@ msgstr "Recent gemelde problemen op FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "Problemen binnen een straal van %.1fkm van deze lokatie" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2822,7 +2919,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Geef een update" @@ -2831,12 +2929,12 @@ msgstr "Geef een update" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Het is optioneel om een wachtwoord op de geven, maar hiermee is het makkelijker om in de toekomst problemen te melden, updates te plaatsen en je meldingen te beheren." @@ -2849,12 +2947,12 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Foto publiceren" @@ -2909,7 +3007,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2934,7 +3032,7 @@ msgstr "RSS feed van updates voor dit probleem" msgid "Receive email when updates are left on this problem." msgstr "Ontvang een e-mail als updates worden achtergelaten bij dit probleem." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2948,7 +3046,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Recent gemelde problemen" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2972,9 +3070,9 @@ msgstr "Verwijder markering" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2982,12 +3080,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Verwijder foto (kan niet ongedaan worden!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "Beantwoord" @@ -3016,11 +3118,11 @@ msgstr "Meld misbruik" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Meld op %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3035,17 +3137,17 @@ msgstr "Probleem melden" msgid "Report, view, or discuss local problems" msgstr "Meld, bekijk of discussier over lokale problemen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Anoniem gemeld bij %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Eerder gemeld" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Gemeld door %s bij %s" @@ -3059,27 +3161,27 @@ msgstr "Gemeld door:" msgid "Reported in the %s category" msgstr "Toegewezen aan categorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Anoniem gemeld in de categorie %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Gemeld in de categorie %s door %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Anoniem door %s gemeld bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Gemeld door %s door %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Anoniem gemeld bij %s in de categorie %s door %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeld door %s in de categorie %s door %s bij %s" @@ -3088,8 +3190,8 @@ msgstr "Gemeld door %s in de categorie %s door %s bij %s" msgid "Reported:" msgstr "Gemeld:" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3097,10 +3199,9 @@ msgstr "Gemeld:" msgid "Reporting a problem" msgstr "Meld een probleem" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Meldingen" @@ -3117,7 +3218,7 @@ msgstr "" msgid "Reports by destination" msgstr "Gemeld door %s bij %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3129,7 +3230,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3184,21 +3285,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3217,17 +3319,17 @@ 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:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Linksom roteren" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Rechtsom roteren" @@ -3237,21 +3339,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3262,12 +3364,12 @@ msgstr "Wijzigingen opslaan" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3286,7 +3388,7 @@ msgstr "Zoek Meldingen" msgid "Search Users" msgstr "Zoek Gebruikers" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Meldingen zoeken" @@ -3297,6 +3399,7 @@ msgid "Search:" msgstr "Zoek:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Geen meldingen gevonden." @@ -3309,7 +3412,7 @@ msgstr "Geen gebruikers gevonden." msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3318,8 +3421,8 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Selecteer een gebied" @@ -3339,11 +3442,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Verzonden aan %s %s later" @@ -3352,11 +3460,11 @@ msgid "Sent:" msgstr "Verzonden:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Service:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3365,9 +3473,9 @@ msgid "Share" msgstr "Deel" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3375,19 +3483,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3395,40 +3503,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Toon mijn naam publiekelijk" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Toon oud" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Toon spelden" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3439,12 +3544,16 @@ msgstr "Inloggen" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Inloggen of maak een account" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Uitloggen" @@ -3460,7 +3569,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "" @@ -3473,15 +3582,19 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3514,20 +3627,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Startdatum:" #: templates/web/base/admin/body.html:73 @@ -3537,15 +3651,18 @@ msgstr "Startdatum:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Staat" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Wijzigingen opslaan" @@ -3559,17 +3676,19 @@ msgstr "Wijzigingen opslaan" msgid "State:" msgstr "Staat:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Staat" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistieken" @@ -3579,7 +3698,7 @@ msgstr "Statistieken" msgid "Status" msgstr "Status" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "" @@ -3592,7 +3711,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Subcategorie: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Subcategorie: %s" @@ -3609,18 +3733,19 @@ msgstr "Onderwerp" msgid "Subject:" msgstr "Onderwerp:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Opslaan" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3661,7 +3786,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3669,25 +3794,30 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Samenvatting" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +msgid "Summary statistics" +msgstr "" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -3695,14 +3825,14 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -3710,7 +3840,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3737,7 +3867,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" @@ -3753,7 +3883,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3763,11 +3893,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "De postcode is niet geldig." -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Het probleem is gemarkeerd als verzonden." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Het probleem wordt opnieuw verzonden." @@ -3799,8 +3929,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3833,8 +3963,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "De foutmelding was: %s" @@ -3876,7 +4006,7 @@ msgstr "Laatste problemen die als opgelost zijn gemeld door gebruikers" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Laatste problemen binnen de grenzen van {{NAME}} gemeld door gebruikers" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3901,7 +4031,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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" @@ -3912,33 +4042,38 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Er was een probleem met je e-mailadres/wachtwoord combinatie. Als je het wachtwoord niet kunt herinneren, of je hebt er geen een, vul dan het formulier ‘inloggen via email’ in." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Er was een probleem met je e-mailadres/wachtwoord combinatie. Probeer het later nog eens." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Er was een probleem met je e-mailadres/wachtwoord combinatie. Als je het wachtwoord niet kunt herinneren, of je hebt er geen een, vul dan het formulier ‘inloggen via email’ in." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Er was een probleem met je update. Probeer het later nog eens." @@ -3946,7 +4081,7 @@ msgstr "Er was een probleem met je update. Probeer het later nog eens." msgid "There were problems with your report. Please see below." msgstr "Er was een probleem met je melding. Zie beneden." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Er was een probleem met je update. Zie beneden." @@ -4001,26 +4136,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Deze informatie is verplicht" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Dit is een ontwikkelingssite; er kunnen mogelijk problemen optreden, en de database wordt regelmatig opgeschoond." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4037,7 +4180,7 @@ msgstr "Dit probleem is niet opgelost" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4047,23 +4190,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Deze melding is momenteel gemarkeerd als gesloten." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Deze melding is momenteel gemarkeerd als opgelost." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Deze melding is momenteel gemarkeerd als openstaand." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4074,7 +4217,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tijdslijn" @@ -4086,20 +4229,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Titel" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Titel:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Vul je postcode of straatnaam en plaats in om te kijken welke lokale meldingen we voor je hebben." @@ -4111,44 +4255,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Totaal" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Totaal" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4161,18 +4297,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Opnieuw proberen" @@ -4187,7 +4324,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4196,15 +4337,11 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "Onopgeloste meldingen" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -4214,13 +4351,14 @@ msgstr "" msgid "Unknown error" msgstr "" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4245,12 +4383,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4258,16 +4396,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -4281,20 +4419,20 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Geplaatst door %s (%s) bij %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Geplaatst door %s bij %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4302,7 +4440,7 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" @@ -4349,40 +4487,81 @@ msgstr "Gebruikte kaart" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Email toegevoegd aan zwarte lijst" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Email staat al op zwarte lijst" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "(Email in misbruiktabel)" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Gebruikers" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Gebruikers" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Jouw e-mailadres" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Je telefoonnummer" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4404,12 +4583,7 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4419,20 +4593,24 @@ msgstr "" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." +msgid "We found more than one match for that location." msgstr "" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "" @@ -4440,6 +4618,11 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4449,8 +4632,8 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4478,7 +4661,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4501,6 +4684,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4517,16 +4704,7 @@ msgstr "Je bericht is moeilijk leesbaar als deze alleen uit hoofdletters bestaat msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Jaar" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4541,7 +4719,7 @@ msgstr "Jaar" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Ja" @@ -4554,7 +4732,7 @@ msgstr "Ja, ik heb een wachtwoord" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4571,7 +4749,7 @@ msgstr "Je meld het volgende update als beledigend, persoonlijke informatie beva msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4597,7 +4775,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4605,7 +4783,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4632,18 +4810,34 @@ msgstr "Je bent uitgelogd" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Je hebt een probleem aangewezen op de plek gemarkeerd met een groene speld op de kaart. Als dit niet klopt kan je nogmaals op de kaart klikken." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +msgid "You have successfully added your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" +#: templates/web/base/auth/change_phone.html:15 +msgid "You have successfully confirmed your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +msgid "You have successfully removed your phone number." +msgstr "" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Je bent ingelogd; controleer of je gegevens nog kloppen:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +msgid "You have successfully verified your phone number." +msgstr "" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4667,36 +4861,43 @@ msgid "Your Reports" msgstr "Jouw meldingen" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Jouw e-mail" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Jouw e-mailadres" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Jouw e-mailadres" + #: 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" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4707,19 +4908,19 @@ msgstr "Jouw naam" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4730,8 +4931,8 @@ msgstr "Jouw wachtwoord" msgid "Your password has been changed" msgstr "Je wachtwoord is gewijzigd" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Je telefoonnummer" @@ -4740,7 +4941,7 @@ msgstr "Je telefoonnummer" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Jouw meldingen" @@ -4749,25 +4950,40 @@ msgstr "Jouw meldingen" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Je wachtwoord is gewijzigd" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Jouw updates" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4784,8 +5000,8 @@ msgstr "gemeente" msgid "didn't use map" msgstr "kaart niet gebruikt" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "bv. '%s' of '%s'" @@ -4808,22 +5024,23 @@ msgstr "" msgid "less than a minute" msgstr "minder dan een minuut" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n/b" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "" @@ -4863,7 +5080,7 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4871,11 +5088,11 @@ msgstr "" msgid "today" msgstr "vandaag" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4883,14 +5100,24 @@ msgstr "" msgid "used map" msgstr "" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Email staat al op zwarte lijst" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Email toegevoegd aan zwarte lijst" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4952,35 +5179,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5050,6 +5277,36 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Klik hier of geef de datum in dd/mm/yyyy formaat" + +#~ msgid "Hide old" +#~ msgstr "Verberg oud" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Ongeverifiëerde meldingen meesturen" + +#~ msgid "Invalid end date" +#~ msgstr "Ongeldige einddatum" + +#~ msgid "Invalid start date" +#~ msgstr "Ongeldige startdatum" + +#~ msgid "No council" +#~ msgstr "Geen gemeente" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Let op dat als je onbevestigde meldingen meeneemt we de datum gebruiken waarop de melding is gemaakt, dit kan afwijken van de maand waarin de melding is bevestigd dus dan kunnen de cijfers afwijken." + +#~ msgid "Show old" +#~ msgstr "Toon oud" + +#~ msgid "Unfixed reports" +#~ msgstr "Onopgeloste meldingen" + +#~ msgid "Year" +#~ msgstr "Jaar" + #~ msgid "%s ward, %s" #~ msgstr "%s district, %s" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index aea98bab58b..878465ba218 100644 --- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Norwegian Nynorsk (Norway) (https://www.transifex.com/mysociety/teams/12067/nn_NO/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr " og " @@ -32,6 +32,10 @@ msgstr " og " msgid " or " msgstr " eller " +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d redigeringar av %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s administrasjonskontaktar – %s stadfesta, %s ikkje stadfesta" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s aktive oppdateringar" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s spørjeskjema sendt – %s svart (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s spørjeskjema sendt – %s svart (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Epost i misbruktabellen)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -161,8 +165,8 @@ msgstr "(sendt til begge)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS-straum for problem innanfor %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" @@ -175,14 +179,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -191,16 +187,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -209,33 +205,49 @@ msgstr "" msgid "%s live problems" msgstr "%s aktive problem" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my report by email/text" +msgstr "" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my update by email/text" +msgstr "" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +msgid "No let me sign in by email or text" +msgstr "" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Ja, eg har eit passord" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -249,11 +261,17 @@ msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Bannlys e-postadresse" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -276,11 +294,16 @@ msgstr "Legg til ny kategori" msgid "Add option" msgstr "(valfritt)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -290,23 +313,23 @@ msgstr "" msgid "Add user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "La til %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -330,9 +353,10 @@ msgstr "Varsel %d kobla ut (oppretta %s)" msgid "Alert me to future updates" msgstr "Send meg varsel ved framtidige oppdateringar" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -341,12 +365,13 @@ msgstr "" msgid "All Reports" msgstr "" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -362,17 +387,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alle rapportar" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -410,7 +435,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -421,7 +447,7 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -435,7 +461,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "" @@ -447,7 +473,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -463,12 +489,16 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +msgid "Auto Response" +msgstr "" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -476,18 +506,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -501,20 +523,21 @@ msgstr "" msgid "Back" msgstr "" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Bannlys e-postadresse" +#, fuzzy +msgid "Ban user" +msgstr "Flagg brukar" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "" @@ -525,14 +548,10 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "På dato" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -545,8 +564,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -557,30 +577,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategori" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -588,17 +614,17 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategori: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -606,10 +632,15 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Byt passord" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +msgid "Change phone number" +msgstr "" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -631,19 +662,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "" @@ -671,18 +697,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Lukka" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" @@ -697,16 +724,17 @@ msgid "Cobrand" msgstr "Merkevaresamarbeid" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Data om merkevaresamarbeid:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -714,7 +742,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -723,7 +751,7 @@ msgstr "" msgid "Confirm" msgstr "Stadfest" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Stadfest konto" @@ -742,14 +770,10 @@ msgstr "Stadfesting" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Stadfesta" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -776,8 +800,8 @@ msgstr "Kontakt prosjektgruppa" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -795,43 +819,16 @@ msgstr "Administrasjon" msgid "Council contacts for %s" msgstr "Administrasjonskontaktar for %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Administrasjon:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Mengd" @@ -853,39 +850,44 @@ msgstr "Lag kategori" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Oppretta" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Oppretta:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Gjeldande tilstand" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -896,14 +898,14 @@ msgstr "" msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -915,12 +917,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -931,8 +933,8 @@ msgstr "" msgid "Deleted" msgstr "Sletta" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -948,6 +950,10 @@ msgstr "" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -960,6 +966,10 @@ msgstr "" msgid "Details:" msgstr "Detaljar:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "" @@ -973,8 +983,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "Arbeidshestar" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -983,7 +993,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -991,7 +1001,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1011,11 +1021,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1035,9 +1045,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Rediger" @@ -1047,33 +1058,33 @@ msgstr "Rediger" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Rediger problem %d" @@ -1094,7 +1105,6 @@ msgstr "Oppdatert av" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1102,17 +1112,20 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "E-post lagd til misbrukliste" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "E-post lagd til misbrukliste" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1121,19 +1134,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "E-post allereie i misbruklista" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "" @@ -1146,17 +1158,18 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" -msgstr "" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" +msgstr "På dato" #: templates/web/base/admin/open311-form-fields.html:21 msgid "Endpoint" @@ -1176,14 +1189,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Enter a password" @@ -1201,8 +1214,8 @@ msgstr "Legg inn detaljar om problemet" msgid "Error" msgstr "Feil" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1227,7 +1240,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1243,7 +1256,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1255,7 +1268,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" @@ -1266,7 +1279,7 @@ msgstr "" msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1296,21 +1309,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Løyst" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Løyst – Administrasjon" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Løyst – Brukar" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "" @@ -1318,7 +1332,7 @@ msgstr "" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Flagga:" @@ -1327,7 +1341,7 @@ msgstr "Flagga:" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1335,8 +1349,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Flagga:" @@ -1356,7 +1370,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1376,8 +1390,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Ofte spurde spurnader" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1410,12 +1428,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Hald fram" @@ -1423,7 +1441,7 @@ msgstr "Hald fram" msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1431,6 +1449,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Graf over problemoppretting fordelt på status over tid" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "av %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Har dette problemet vorte løyst?" @@ -1451,21 +1478,26 @@ msgstr "Hjelp" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Bilete av nye problem i nærleiken" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Skjult" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1486,21 +1518,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1512,7 +1541,7 @@ msgstr "" msgid "History" msgstr "Historie" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "" @@ -1569,12 +1598,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1583,7 +1620,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1592,7 +1629,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1664,11 +1701,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Inkluder ikkje-stadfesta problem" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi «%s»" @@ -1680,7 +1713,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1692,26 +1725,18 @@ msgstr "" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Ugyldig slutt-dato" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Ugyldig startdato" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1730,7 +1755,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1755,12 +1780,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1786,18 +1806,14 @@ msgstr "Siste oppdatering:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1806,13 +1822,13 @@ msgstr "" msgid "List all reported problems" msgstr "Vis alle rapporterte problem" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Lastar …" #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1844,12 +1860,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1857,11 +1876,11 @@ msgstr "" msgid "MAP" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1873,11 +1892,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1897,45 +1916,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Månad" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1953,9 +1972,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1966,19 +1985,23 @@ msgstr "Namn" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Namn:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1988,12 +2011,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2007,19 +2030,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2040,6 +2067,10 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +msgid "New phone number:" +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2069,18 +2100,19 @@ msgstr "Nye rapportar innanfor grensa til {{NAME}} på FiksGataMi" msgid "New reports" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Ny tilstand" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2088,7 +2120,7 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2100,22 +2132,18 @@ msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Nei" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Ingen administrasjon" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -2145,6 +2173,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "" @@ -2167,15 +2199,15 @@ msgstr "" msgid "None" msgstr "Ingen" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2194,7 +2226,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Ikkje rapportert tidlegare" @@ -2208,10 +2240,6 @@ msgstr "Ikkje rapportert til administrasjonen" msgid "Note" msgstr "Merk" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Merk at når vi tek med ustadfesta rapportar, så brukar vi datoen rapporten var oppretta. Det treng vera den same månaden som rapporten var stadfesta, så tala kan hoppa litt opp og ned." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2239,37 +2267,46 @@ msgstr "" msgid "Now to submit your update…" msgstr "" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Gammal tilstand" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2308,23 +2345,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Anna" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "andre område:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2342,19 +2386,19 @@ msgstr "Fann ikkje sida" msgid "Parent" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Delvis" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Passord:" @@ -2362,7 +2406,7 @@ msgstr "Passord:" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2370,19 +2414,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2398,7 +2447,7 @@ msgstr "Telefon:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2424,12 +2473,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Bilete av nye problem i nærleiken" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "" @@ -2451,25 +2505,34 @@ msgstr "Ver høfleg, poengtert og kortfatta." msgid "Please check the passwords and try again" msgstr "Ver venleg og sjekk passorda og prøv igjen" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2484,39 +2547,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Ver venleg og skriv ei melding" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Skriv inn eit passord" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Ver venleg og legg til ein gyldig e-post" @@ -2525,55 +2596,62 @@ msgstr "Ver venleg og legg til ein gyldig e-post" msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Ver venleg og legg til ein gyldig e-post" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Ver venleg og legg inn namnet ditt" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "" @@ -2624,7 +2702,12 @@ msgstr "" msgid "Please note:" msgstr "Merk:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Ver venleg og bidra med ei forklaring på kvifor du gjenopnar denne problemrapporten" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2664,6 +2747,11 @@ msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Skriv inn ei melding" @@ -2673,7 +2761,7 @@ msgid "Please write your update here" msgstr "" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Send inn" @@ -2682,15 +2770,15 @@ msgstr "Send inn" msgid "Posted anonymously at %s" msgstr "Publisert anonymt %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Sendt inn av %s %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Lagt inn av %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Lagt inn av %s %s" @@ -2702,11 +2790,11 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2723,7 +2811,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "" @@ -2747,21 +2835,21 @@ msgstr "Problem %s stadfesta" msgid "Problem %s sent to council %s" msgstr "Problem %s sendt til administrasjon %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problem markert som ope." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Endring av problemtilstand basert på spørjeundersøkingsresultat" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problem" @@ -2788,7 +2876,7 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi" msgid "Problems within %.1fkm of %s" msgstr "Problem innanfor %.1fkm av denne posisjonen" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2814,7 +2902,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Bidra med ei oppdatering" @@ -2823,12 +2912,12 @@ msgstr "Bidra med ei oppdatering" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Det er valfritt å oppgje eit passord, men om du gjer det vil det verta enklare for deg å rapportera problem, leggja inn oppdateringar og halda oversyn over rapportane dine" @@ -2841,12 +2930,12 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "" @@ -2901,7 +2990,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2926,7 +3015,7 @@ msgstr "RSS-straum med oppdateringar for dette problemet" msgid "Receive email when updates are left on this problem." msgstr "Motta e-post når det er oppdateringar på dette problemet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2940,7 +3029,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Nyleg melde problem" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2964,9 +3053,9 @@ msgstr "Fjern flagg" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2974,12 +3063,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fjern bilete (kan ikkje gjerast om!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3008,11 +3101,11 @@ msgstr "" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Rapport på %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3027,17 +3120,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Rapporter, finn eller diskuter lokale problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Rapportert anonymt %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Publisert av %s %s" @@ -3051,27 +3144,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Rapportert av %s i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" @@ -3080,8 +3173,8 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3089,10 +3182,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "" @@ -3109,7 +3201,7 @@ msgstr "" msgid "Reports by destination" msgstr "Publisert av %s %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3121,7 +3213,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3176,21 +3268,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3209,17 +3302,17 @@ 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:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -3229,21 +3322,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3254,12 +3347,12 @@ msgstr "Lagra endringar" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3277,7 +3370,7 @@ msgstr "Søk i rapportar" msgid "Search Users" msgstr "Søk i brukarar" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "" @@ -3288,6 +3381,7 @@ msgid "Search:" msgstr "Søk:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3300,7 +3394,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3309,8 +3403,8 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "" @@ -3330,11 +3424,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" @@ -3343,11 +3442,11 @@ msgid "Sent:" msgstr "Sendt:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Teneste:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3356,9 +3455,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3366,19 +3465,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3386,40 +3485,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Vis namnet mitt offentleg" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Vis nåler" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3430,12 +3526,16 @@ msgstr "Logg inn" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Logg inn eller opprett ein konto" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Logg ut" @@ -3451,7 +3551,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Nokre bilete av nyleg melde problem" @@ -3464,15 +3564,19 @@ msgstr "Noko tekst å omsetja" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3505,20 +3609,20 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +msgid "Start Date" msgstr "" #: templates/web/base/admin/body.html:73 @@ -3528,15 +3632,18 @@ msgstr "" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Tilstand" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Lagra endringar" @@ -3550,17 +3657,19 @@ msgstr "Lagra endringar" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Tilstand" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistikk" @@ -3570,7 +3679,7 @@ msgstr "Statistikk" msgid "Status" msgstr "" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "" @@ -3583,7 +3692,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Kategori" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "" @@ -3600,18 +3714,19 @@ msgstr "" msgid "Subject:" msgstr "Emne:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Send inn" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3653,7 +3768,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3661,25 +3776,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Oppsummering" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Oppsummeringsrapportar" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Resultat frå spørjeundersøkinga" @@ -3687,14 +3808,14 @@ msgstr "Resultat frå spørjeundersøkinga" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -3702,7 +3823,7 @@ msgstr "Tekst" msgid "Text only version" msgstr "Tekst-utgåve" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3732,7 +3853,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" @@ -3748,7 +3869,7 @@ msgstr "Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på ny msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3758,11 +3879,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." @@ -3794,8 +3915,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3828,8 +3949,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Feilen var: %s" @@ -3871,7 +3992,7 @@ msgstr "Dei siste problema rapportert fiksa av brukarar" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Dei siste problema innanfor grensa til {{NAME}} rapportert av brukarar" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3896,7 +4017,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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" @@ -3907,33 +4028,37 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Det var problem med e-post/passord-kombinasjonen din. Ver venleg og prøv igjen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." @@ -3941,7 +4066,7 @@ msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen." msgid "There were problems with your report. Please see below." msgstr "Det var problem med rapporten din. Ver venleg og sjå under." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." @@ -3996,26 +4121,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Denne informasjonen er påkravd" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Dette er ein utviklarnettstad. Ting kan knekka når som helst og databasen vil verta periodisk sletta." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4032,7 +4165,7 @@ msgstr "Dette problemet har ikkje vorte løyst" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4042,23 +4175,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Denne rapporten er for tida markert som lukka." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Denne rapporten er for tida markert som fiksa." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4069,7 +4202,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4081,20 +4214,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Tittel" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" @@ -4106,44 +4240,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 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" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Totalt" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Totalt" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4156,18 +4282,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "" @@ -4182,7 +4309,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4191,15 +4322,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Ikkje stadfesta" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Ukjend varsel-type" @@ -4209,13 +4336,14 @@ msgstr "Ukjend varsel-type" msgid "Unknown error" msgstr "" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Ukjend problem-ID" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4240,12 +4368,12 @@ msgstr "Oppdateringa under vart lagt inn anonymt %s" msgid "Update below added by %s at %s" msgstr "Oppdateringa under vart lagt til av %s %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Tilstandsfordeling for oppdateringar" @@ -4253,16 +4381,16 @@ msgstr "Tilstandsfordeling for oppdateringar" msgid "Update by {{name}}" msgstr "Oppdatert av {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Ei oppdatering endra problemstatusen til %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Ei oppdatering markerte dette problemet som fiksa." -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Ei oppdatering gjenopna problemet" @@ -4276,20 +4404,20 @@ msgstr "Oppdater tilstanden" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Lagt inn av %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Lagt inn av %s %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4297,7 +4425,7 @@ msgid "Updated!" msgstr "Oppdatert!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Oppdateringar" @@ -4344,40 +4472,80 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "E-post lagd til misbrukliste" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "E-post allereie i misbruklista" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Brukar flagga" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "(Epost i misbruktabellen)" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Brukarar" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Brukarar" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Verdi oppdatert" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Bannlys e-postadresse" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +msgid "Verify phone number" +msgstr "" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4399,12 +4567,7 @@ msgstr "Ser på ein stad" msgid "Viewing a problem" msgstr "Ser på eit problem" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4414,20 +4577,25 @@ msgstr "Bydelar innanfor denne administrasjonen" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Vi fann meir ein eitt treff for den staden. Vi viser opp til ti treff, så prøv eit anna søk viss staden din ikkje er her." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Orsak, vi kunne ikkje finna den staden." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4435,6 +4603,12 @@ msgstr "Vi innser at %s kan vera ansvarleg for dette problemet, men vi manglar f msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegner" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Vi fann meir ein eitt treff for den staden. Vi viser opp til ti treff, så prøv eit anna søk viss staden din ikkje er her." + #: 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." @@ -4444,8 +4618,8 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4473,7 +4647,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4496,6 +4670,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "Når du søkjer etter førespurnader, så er det òg mogleg å søkja etter agency_responsible for å avgrensa det til førespurnader som er sendt til ein einskild adminstrasjon. Søkjetermen er administrasjonssida som du får frå MaPit." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4512,16 +4690,7 @@ msgstr "Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "År" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4536,7 +4705,7 @@ msgstr "År" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Ja" @@ -4549,7 +4718,7 @@ msgstr "" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4566,7 +4735,7 @@ msgstr "Du rapporterer at følgjande oppdatering er støytande, inneheld personl msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4592,7 +4761,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4600,7 +4769,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4627,18 +4796,34 @@ msgstr "Du er allereie logga ut" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +msgid "You have successfully added your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" +#: templates/web/base/auth/change_phone.html:15 +msgid "You have successfully confirmed your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +msgid "You have successfully removed your phone number." +msgstr "" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har no logga inn. Ver venleg og sjekk og stadfest at detaljane dine er korrekte:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +msgid "You have successfully verified your phone number." +msgstr "" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4662,36 +4847,42 @@ msgid "Your Reports" msgstr "Rapportane dine" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +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 "" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4702,19 +4893,19 @@ msgstr "" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4725,8 +4916,8 @@ msgstr "" msgid "Your password has been changed" msgstr "Passordet ditt har vorte endra" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "" @@ -4735,7 +4926,7 @@ msgstr "" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Oppdateringane dine" @@ -4744,25 +4935,40 @@ msgstr "Oppdateringane dine" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Passordet ditt har vorte endra" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Oppdateringane dine" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4779,8 +4985,8 @@ msgstr "administrasjon" msgid "didn't use map" msgstr "brukte ikkje kart" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4803,22 +5009,23 @@ msgstr "" msgid "less than a minute" msgstr "mindre enn eitt minutt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "i/t" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "" @@ -4859,7 +5066,7 @@ msgstr "" msgid "this location" msgstr "Ser på ein stad" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "denne typen lokalt problem" @@ -4867,11 +5074,11 @@ msgstr "denne typen lokalt problem" msgid "today" msgstr "i dag" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4879,14 +5086,24 @@ msgstr "" msgid "used map" msgstr "brukte kart" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "brukaren er frå same administrasjon som problemet – %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "brukaren er eigaren av problemet" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "E-post allereie i misbruklista" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "E-post lagd til misbrukliste" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4948,35 +5165,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5046,6 +5263,24 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "Include unconfirmed reports" +#~ msgstr "Inkluder ikkje-stadfesta problem" + +#~ msgid "Invalid end date" +#~ msgstr "Ugyldig slutt-dato" + +#~ msgid "Invalid start date" +#~ msgstr "Ugyldig startdato" + +#~ msgid "No council" +#~ msgstr "Ingen administrasjon" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Merk at når vi tek med ustadfesta rapportar, så brukar vi datoen rapporten var oppretta. Det treng vera den same månaden som rapporten var stadfesta, så tala kan hoppa litt opp og ned." + +#~ msgid "Year" +#~ msgstr "År" + #~ msgid "%s ward, %s" #~ msgstr "%s bydel, %s" diff --git a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po index 8b045a71b11..de511b4b740 100644 --- a/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pt.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Portuguese (https://www.transifex.com/mysociety/teams/12067/pt/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "e" @@ -32,6 +32,10 @@ msgstr "e" msgid " or " msgstr "ou" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d edições por %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s contactos da Zona; %s confirmada,%s não confirmados" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s atualizações directas" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s questionários enviados - %s respondeu (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s questionários enviados - %s respondeu (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(E-mail na tabela de abuso)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(Como ruas e pavimentos esburacados, grafitis, árvores caídas, lajes partidas, entulhos, lixo, sinais transito, vandalismo, postes caídos, vazamentos de agua e esgotos, iluminação pública ou qualquer outro problema)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -161,8 +165,8 @@ msgstr "(remeter para ambos)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS feed dos Problemas Nesta %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Escolha uma categoria --" @@ -175,14 +179,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -191,17 +187,17 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -210,33 +206,52 @@ msgstr "" msgid "%s live problems" msgstr "%s problemas ao vivo" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr " Não Deixe-me confirmar o meu relatório por e-mail" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr " Não Deixe-me confirmar o meu relatório por e-mail" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr " Não Deixe-me confirmar a minha atualização por e-mail" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr " Não Deixe-me confirmar a minha atualização por e-mail" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr " Não , deixe-me entrar por e-mail" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr " Não , deixe-me entrar por e-mail" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr " Sim Eu tenho uma password" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -250,11 +265,17 @@ msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Adicionar" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Ban endereço de e-mail" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -277,11 +298,17 @@ msgstr "Adicionar nova categoria" msgid "Add option" msgstr "(opcional)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Sem número de telefone)" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -291,23 +318,23 @@ msgstr "" msgid "Add user" msgstr "Adicionar user" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Adicionado %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -331,9 +358,10 @@ msgstr "Alerta %d desativada (criado %s)" msgid "Alert me to future updates" msgstr "Avise-me de atualizações futuras" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -342,12 +370,13 @@ msgstr "" msgid "All Reports" msgstr "Todos os Relatórios" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -363,17 +392,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Todos os relatórios" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Todos os relatórios entre %s e %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -411,7 +440,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -422,7 +452,7 @@ msgstr "" msgid "Area covered" msgstr "Área coberta" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -436,7 +466,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Atribuir a categoria diferente:" @@ -448,7 +478,7 @@ msgstr "Atribuir ao órgão externo:" msgid "Assign to subdivision:" msgstr "Atribuir a subdivisão:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -464,12 +494,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Nao responsavel" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -477,18 +512,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -502,20 +529,21 @@ msgstr "Aguardando moderação" msgid "Back" msgstr "Voltar" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Ban endereço de e-mail" +#, fuzzy +msgid "Ban user" +msgstr "Bandeira - Usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Corpos" @@ -526,14 +554,10 @@ msgstr "Corpos" msgid "Body" msgstr "Corpo" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Corpo:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Por data" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -546,8 +570,9 @@ 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:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -558,30 +583,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Categoria" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Categoria" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -589,17 +620,17 @@ msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes" msgid "Category:" msgstr "Categoria:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Categoria: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -607,10 +638,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Mudar password" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Sem número de telefone)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -632,19 +669,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Clique no mapa para reportar um problema " @@ -673,18 +705,19 @@ msgstr "Clique no link do email de confirmação para entrar" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Fechado" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Fechado pelo Município" @@ -699,16 +732,17 @@ msgid "Cobrand" msgstr "Cobrand" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Cobrand data:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -716,7 +750,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -725,7 +759,7 @@ msgstr "" msgid "Confirm" msgstr "Confirmar" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Confirmar conta" @@ -744,14 +778,10 @@ msgstr "Confirmação" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Confirmado" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Relatos confirmados entre %s e %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -778,8 +808,8 @@ msgstr "Fale com a equipe" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Não foi possível encontrar usuário" @@ -797,43 +827,16 @@ msgstr "Concelho" msgid "Council contacts for %s" msgstr "Contactos do município para %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Concelho:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Conta" @@ -855,39 +858,44 @@ msgstr "Criar uma categoria" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Criado" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Criado:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Estado actual" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -898,14 +906,14 @@ msgstr "" msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Painel de instrumentos" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Tratadas pelas subdivisões dentro de 5 dias úteis" @@ -917,12 +925,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -933,8 +941,8 @@ msgstr "" msgid "Deleted" msgstr "Excluidos" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -950,6 +958,10 @@ msgstr "Descrição detalhada do problema" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -962,6 +974,10 @@ msgstr "DEtalhes" msgid "Details:" msgstr "Detalhes:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Delegada" @@ -975,8 +991,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "Diligency prêmio tabela classificativa" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -985,7 +1001,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -993,7 +1009,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "Já tem uma password?" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1013,11 +1029,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1037,9 +1053,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Editar" @@ -1049,33 +1066,33 @@ msgstr "Editar" msgid "Edit body details" msgstr "Editar os detalhes do corpo" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Editando problema %d" @@ -1096,7 +1113,6 @@ msgstr "Editar" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1104,17 +1120,20 @@ msgstr "Editar" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Email adicionado a lista de abusos" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Password (opcional)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1123,19 +1142,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "E-mail já está na lista abusos" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Email: %s" @@ -1148,17 +1166,18 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" -msgstr "" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" +msgstr "Por data" #: templates/web/base/admin/open311-form-fields.html:21 msgid "Endpoint" @@ -1178,14 +1197,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Inserir um código postal válido (xxxx-xxx), ou nome da rua, zona ou localidade" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Digite um nome de rua nas proximidades e área" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Digite uma nova password" @@ -1203,8 +1222,8 @@ msgstr "Escreva de forma detalhada o problema, incluindo uma fotografia" msgid "Error" msgstr "Erro" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Todos" @@ -1229,7 +1248,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1245,7 +1264,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1257,7 +1276,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1269,7 +1288,7 @@ msgstr "Dados adicionais:" msgid "Extra data:" msgstr "Dados adicionais:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1299,21 +1318,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "FIX" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Corrigido - Concelho" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Corrigido - Usuario" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "" @@ -1321,7 +1341,7 @@ msgstr "" msgid "Flag user" msgstr "Bandeira - Usuario" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Marcado" @@ -1330,7 +1350,7 @@ msgstr "Marcado" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1338,8 +1358,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Marcado:" @@ -1359,7 +1379,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1379,8 +1399,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Perguntas mais frequentes" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1413,12 +1437,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr " Ir" @@ -1426,7 +1450,7 @@ msgstr " Ir" msgid "Going to send questionnaire?" msgstr "Vai enviar questionário?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1434,6 +1458,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Status da tabela grafica ao longo do tempo" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "por %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Este problema já foi fixado, relatado?" @@ -1454,21 +1487,26 @@ msgstr "Ajuda" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Fotos de relatórios recentes mais proximos" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Oi %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Esconder" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1489,21 +1527,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Ocultar" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Ocultar pins" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1515,7 +1550,7 @@ msgstr "" msgid "History" msgstr "History pins" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Home" @@ -1572,12 +1607,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1586,7 +1629,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1595,7 +1638,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1667,11 +1710,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "Incluir reports detalhes perssoais" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Incluir dados nao confirmados" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Foto_has valor incorreto \"%s\"" @@ -1683,7 +1722,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1695,26 +1734,18 @@ msgstr "" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Agencia_responsavel valor %s inválido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Invalido data final" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Formato inválido%s especificado." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Data de inicio invalida" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1733,7 +1764,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1758,12 +1789,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1789,18 +1815,14 @@ msgstr "Última atualização:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1809,13 +1831,13 @@ msgstr "" msgid "List all reported problems" msgstr "Listar todos os problemas relatados" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Carregando ..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1847,12 +1869,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1860,11 +1885,11 @@ msgstr "" msgid "MAP" msgstr "Mapa" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1876,11 +1901,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1900,45 +1925,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Falta informaçao jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Moderado por divisão dentro de um dia de trabalho" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Mês" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1956,9 +1981,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1969,19 +1994,23 @@ msgstr "Nome" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Nome:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Nome: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1991,12 +2020,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2013,19 +2042,24 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "Está quase! Agora basta verificar o seu email…" +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "Está quase! Agora basta verificar o seu email…" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Novo corpo adicionado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Novo contato de categoria adicionado" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2046,6 +2080,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Sem número de telefone)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2075,18 +2114,19 @@ msgstr "Novos problemas dentro de {{NAME}} 's fronteira em FixMyStreetMindelo" msgid "New reports" msgstr "Novos reports" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Novo estado" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2094,7 +2134,7 @@ msgstr "" msgid "Next" msgstr "Proximo" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2106,22 +2146,18 @@ msgstr "Proximo" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Nao" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Nenhum corpo" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Sem concelho" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Nenhum Concelho selecionado" @@ -2151,6 +2187,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Nenhum resultado retornado" @@ -2173,15 +2213,15 @@ msgstr "Não apoiantes" msgid "None" msgstr "Nenhum" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2200,7 +2240,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "Nao pertence ao meu sector" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Nao reportado antes" @@ -2214,10 +2254,6 @@ msgstr "Nao reportado ao município" msgid "Note" msgstr "Nota" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Note que quando incluimos relatos não confirmados usamos a data em que o relatório foi criado, que pode não estar no mesmo mês em que o relatório foi confirmado de modo que os números podem estar alterados." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2245,37 +2281,46 @@ msgstr "Finalmente, para enviar o seu relatório ..." msgid "Now to submit your update…" msgstr "Finalmente, para enviar a sua actualização ..." -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Estado antigo" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2314,23 +2359,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Outro" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "outras áreas:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2348,19 +2400,19 @@ msgstr "Pagina nao encontrada" msgid "Parent" msgstr "Parente" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Parcial" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Password (opcional)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Password:" @@ -2368,7 +2420,7 @@ msgstr "Password:" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2376,19 +2428,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Telefone (opcional)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefone:" @@ -2404,7 +2461,7 @@ msgstr "Telefone:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2430,12 +2487,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Fotos de relatórios recentes mais proximos" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Coloque a fix pin no mapa" @@ -2457,25 +2519,34 @@ msgstr "Por favor, seja educado, objectivo, conciso e direto ao ponto." msgid "Please check the passwords and try again" msgstr "Por favor verifique as passwords e tente novamente" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Favor verificar se seu email esta correcto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Favor verificar se seu email esta correcto" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Escolher uma categoria" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2493,39 +2564,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Por favor insira uma mensagem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Por favor insira uma mensagem" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Por favor insira uma password" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Por favor insira um assunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Por favor insira um email valido" @@ -2534,55 +2613,62 @@ msgstr "Por favor insira um email valido" 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:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Por favor insira um email valido" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Por favor, insira alguns detalhes" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Digite o seu e-mail" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Por favor, insira o seu endereço de email" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Digite seu primeiro nome" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Digite seu nome" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Digite seu segundo nome, apelido" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Por favor, insira o seu título" @@ -2631,7 +2717,12 @@ msgstr "" msgid "Please note:" msgstr "Favor notar:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Favor fornecer uma explicação de por que você está reabrindo este relatório" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2671,6 +2762,11 @@ msgstr "Por favor, indique se o problema foi corrigido" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Por favor, escreva uma mensagem" @@ -2680,7 +2776,7 @@ msgid "Please write your update here" msgstr "Por favor, escreva a sua atualização aqui" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Postar" @@ -2689,15 +2785,15 @@ msgstr "Postar" msgid "Posted anonymously at %s" msgstr "Postado anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Postado por %s aem %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Postado por %s (%s) em %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Postado por %s em %s" @@ -2709,11 +2805,11 @@ msgstr "" msgid "Previous" msgstr "Anterior" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2730,7 +2826,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privado" @@ -2754,21 +2850,21 @@ msgstr "Problema %s confirmado" msgid "Problem %s sent to council %s" msgstr "Problema %s enviado ao conselho %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Colapso problema por estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problema marcado como aberto." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 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:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemas" @@ -2795,7 +2891,7 @@ msgstr "Problemas relatados recentemente fixados em FixMyStreetMindelo" msgid "Problems within %.1fkm of %s" msgstr "Problemas dentro de %.1fkm deste local" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2821,7 +2917,8 @@ msgstr "" msgid "Property address:" msgstr "Endereço do imóvel:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Fornecer uma atualização" @@ -2830,12 +2927,12 @@ msgstr "Fornecer uma atualização" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Fornecer uma password é opcional, mas isso vai permitir reportar problemas de forma mais fácil, actualizar e gerir os seus relatórios." @@ -2848,12 +2945,12 @@ msgstr "" msgid "Public response:" msgstr "Resposta do público:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Publicar foto" @@ -2908,7 +3005,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2933,7 +3030,7 @@ msgstr "RSS feed de atualizações para este problema" msgid "Receive email when updates are left on this problem." msgstr "RSS feed dos problemas locais recentes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2947,7 +3044,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Problemas recentemente reportados" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2971,9 +3068,9 @@ msgstr "Remover bandeira" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2981,12 +3078,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Remover foto (não pode ser desfeita!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3015,11 +3116,11 @@ msgstr "Abusivo" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Relatório sobre %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3034,17 +3135,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "Reportar, ver ou discutir problemas locais" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Relatado anonimamente em %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Relatado antes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Relatado por %s em %s" @@ -3058,27 +3159,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Relatado na categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Relatado na categoria %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Relatado na categoria %s por %s em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Relatado por %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Relatado por %s por%s em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Relatado por %s na categoria %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Relatado por %s na categoria %s por %s em %s" @@ -3087,8 +3188,8 @@ msgstr "Relatado por %s na categoria %s por %s em %s" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3096,10 +3197,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Relatando um problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Relatórios" @@ -3116,7 +3216,7 @@ msgstr "Relatórios aguardando aprovação" msgid "Reports by destination" msgstr "Relatado por %s em %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3128,7 +3228,7 @@ msgstr "" msgid "Reports published" msgstr "Os relatórios publicados" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3183,21 +3283,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3216,17 +3317,17 @@ 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:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Girar para a esquerda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Girar para a direita" @@ -3236,21 +3337,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3261,12 +3362,12 @@ msgstr "Salvar alterações" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3285,7 +3386,7 @@ msgstr "Busca Reports" msgid "Search Users" msgstr "Procurar Usuários" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "elatórios de pesquisa" @@ -3296,6 +3397,7 @@ msgid "Search:" msgstr "Pesquisar:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3308,7 +3410,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3317,8 +3419,8 @@ msgstr "" msgid "Select a body" msgstr "Selecione um corpo" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Selecione uma área" @@ -3338,11 +3440,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Enviado para %s %s mais tarde" @@ -3351,11 +3458,11 @@ msgid "Sent:" msgstr "Enviar:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Srerviço:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3364,9 +3471,9 @@ msgid "Share" msgstr "Acçao" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3374,19 +3481,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3394,40 +3501,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Mostrar meu nome publicamente" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Mostrar antigo" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Mostrar pins" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3438,12 +3542,16 @@ msgstr "Entrar" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Entrar e criar uma conta" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Sair " @@ -3459,7 +3567,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Fotos de reports recentes" @@ -3472,15 +3580,19 @@ msgstr "Algum informaçao para localizar" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Desculpe, codigo postal nao coincide. Area nao comprrendida." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3513,20 +3625,20 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +msgid "Start Date" msgstr "" #: templates/web/base/admin/body.html:73 @@ -3536,15 +3648,18 @@ msgstr "" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Estado" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Salvar alterações" @@ -3558,17 +3673,19 @@ msgstr "Salvar alterações" msgid "State:" msgstr "Estado" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Estado" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Stats" @@ -3578,7 +3695,7 @@ msgstr "Stats" msgid "Status" msgstr "Status" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Ainda em aberto, via questionário, %s" @@ -3591,7 +3708,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Subcategoria: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Subcategoria: %s" @@ -3608,18 +3730,19 @@ msgstr "Assunto:" msgid "Subject:" msgstr "Assunto:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Submeter" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3661,7 +3784,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3669,25 +3792,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Resumo" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Resumo reports" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Resumo reports" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Resultados teste" @@ -3695,14 +3824,14 @@ msgstr "Resultados teste" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Texto" @@ -3710,7 +3839,7 @@ msgstr "Texto" msgid "Text only version" msgstr "Somente versao texto" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3737,7 +3866,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Obrigado por upload de sua foto. Precisamos agora de localizar o seu problema, então digite um nome de rua nas proximidades ou código postal na caixa acima:" @@ -3753,7 +3882,7 @@ msgstr "Essa imagem não parece ter sido carregada corretamente (%s), por favor 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Esse local não parece estar em Mindelo, por favor tente novamente." @@ -3763,11 +3892,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Esse problema agora será reenviado e reportado ao conselho." @@ -3799,8 +3928,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3833,8 +3962,8 @@ msgstr "O conselho não vai ser capaz de ajudar a menos que você deixe o máxim msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "O erro foi: %s" @@ -3876,7 +4005,7 @@ msgstr "Os últimos problemas relatados fixado por usuários" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Os últimos problemas dentro de {{NAME}} 's fronteira relatados por usuários" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3901,7 +4030,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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" @@ -3912,33 +4041,38 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Não existem relatórios a apresentar" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Houve um problema com o email / combinação de senha. Se você não lembra da sua senha, ou não tiver um, por favor preencha o \"sinal de colocar e-mail 'seção do formulário." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Houve um problema com o email / combinação de senha. Por favor, tente novamente." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Houve um problema com o email / combinação de senha. Se você não lembra da sua senha, ou não tiver um, por favor preencha o \"sinal de colocar e-mail 'seção do formulário." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Houve um problema com a sua atualização. Por favor, tente novamente." @@ -3946,7 +4080,7 @@ msgstr "Houve um problema com a sua atualização. Por favor, tente novamente." msgid "There were problems with your report. Please see below." msgstr "Houve problemas com o seu relatório. Por favor, veja abaixo." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Houve problemas com a sua atualização. Por favor, veja abaixo." @@ -4001,26 +4135,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Esta informação é necessária" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Este é um site do desenvolvedor, as coisas podem quebrar a qualquer momento, e o banco de dados serão apagados periodicamente." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4037,7 +4179,7 @@ msgstr "Este problema não foi corrigido" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4047,23 +4189,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Este relatório está aguardando moderação." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Este relatório está marcado como fechado." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Este relatório está marcado como fixo." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Este relatório está marcado como aberto." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Este relatório foi enviado anonimamente" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4074,7 +4216,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Timeline" @@ -4086,20 +4228,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Titulo" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Para descobrir quais os alertas locais que temos para si, deve inserir o seu código postal ou nome de rua e área ou zona" @@ -4111,44 +4254,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "Para ver no mapa a localização exata desse problema" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Total" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Total" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4161,18 +4296,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Tente novamente" @@ -4187,7 +4323,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4196,15 +4336,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Não confirmado" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "por arranjar" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Desconhecido" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Tipo de alerta desconhecido" @@ -4214,13 +4350,14 @@ msgstr "Tipo de alerta desconhecido" msgid "Unknown error" msgstr "Erro desconhecido" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Desconhecido problema com ID" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4245,12 +4382,12 @@ msgstr "Atualize abaixo colocado de forma anónima em %s" msgid "Update below added by %s at %s" msgstr "Actualizar abaixo adicionado por %s em %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Atualize corpo" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Atualize repartição por Estado" @@ -4258,16 +4395,16 @@ msgstr "Atualize repartição por Estado" msgid "Update by {{name}}" msgstr "Atualize por {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Alterado a actualizaçao do estado do problema para %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Atualizaçao do problema marcado como fixo" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Reaberto a actualizaçao do problema" @@ -4281,20 +4418,20 @@ msgstr "Atualizar status" msgid "Updated" msgstr "Atualizado" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Postado por %s (%s) em %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Postado por %s em %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4302,7 +4439,7 @@ msgid "Updated!" msgstr "Actualizado!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Actualizaçoes" @@ -4349,40 +4486,81 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Email adicionado a lista de abusos" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "E-mail já está na lista abusos" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Bandeira usuário removida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Usuário sinalizado" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "(E-mail na tabela de abuso)" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Usuários" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Usuários" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Valores atualizados" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "O seu endereço de email" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Telefone " + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4404,12 +4582,7 @@ msgstr "Visualizando um local" msgid "Viewing a problem" msgstr "Visualizando um problema" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4419,20 +4592,25 @@ msgstr "Wards deste concelho" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Encontramos mais de uma correspondência para essa localização. Mostramos até dez partidas, por favor tente uma pesquisa diferente se não estiver aqui." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Desculpe, não conseguimos encontrar esse local." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4440,6 +4618,12 @@ msgstr "Percebemos este problema pode ser da responsabilidade do %s, no entanto, msgid "We send it to the council on your behalf" msgstr "Nós enviá-lo para a autoridade competente em seu nome" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Encontramos mais de uma correspondência para essa localização. Mostramos até dez partidas, por favor tente uma pesquisa diferente se não estiver aqui." + #: 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." @@ -4449,8 +4633,8 @@ msgstr "Nós só usamos as suas informações pessoais de acordo com a nossa MaPit." msgstr "Com o pedido de pesquisa, também é possível pesquisar agency_responsavel para limitar as solicitações às enviados para uma única administração. O termo de pesquisa é a identificação de administração fornecidos pela MapIt ." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4517,16 +4705,7 @@ msgstr "Escrever a mensagem inteiramente em letras maiúsculas torna difícil de msgid "Wrong location? Just click again on the map." msgstr "Localização errada? Basta clicar novamente no mapa." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Ano" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4541,7 +4720,7 @@ msgstr "Ano" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Sim" @@ -4554,7 +4733,7 @@ msgstr "Sim, tenho uma password" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4571,7 +4750,7 @@ msgstr "Você está reportando a seguinte atualização por ser abusiva, contend msgid "You can view the problem on this site." msgstr "Você pode ver o problema neste site ." -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4597,7 +4776,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4605,7 +4784,7 @@ msgstr "" 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:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4632,18 +4811,38 @@ msgstr "Voce foi logado fora" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Você localizou o problema no ponto marcado com um pino verde no mapa. Se este não é o local correto, basta clicar no mapa novamente." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Você confirmou com sucesso o seu endereço de e-mail." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Você confirmou com sucesso o seu endereço de e-mail." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Você confirmou com sucesso o seu endereço de e-mail." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Você confirmou com sucesso o seu endereço de e-mail." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Você se inscreveu com sucesso nos, por favor, verificar e confirmar os seus dados estão correctos:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Você confirmou com sucesso o seu endereço de e-mail." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4667,36 +4866,43 @@ msgid "Your Reports" msgstr "Os meus relatórios" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "O seu e-mail" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "O seu endereço de email" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "O seu endereço de email" + #: 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 " -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4707,19 +4913,19 @@ msgstr "Nome" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4730,8 +4936,8 @@ msgstr "Password" msgid "Your password has been changed" msgstr "Sua password foi alterada" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Telefone " @@ -4740,7 +4946,7 @@ msgstr "Telefone " msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Os meus relatórios" @@ -4749,25 +4955,40 @@ msgstr "Os meus relatórios" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Sua password foi alterada" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Suas atualizações" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4784,8 +5005,8 @@ msgstr "concelho" msgid "didn't use map" msgstr "não usar o mapa" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "por exemplo '%s' ou '%s'" @@ -4808,22 +5029,23 @@ msgstr "Última atualizada %s" msgid "less than a minute" msgstr "menos de um minuto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n / a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "ou localizár-me automaticamente" @@ -4864,7 +5086,7 @@ msgstr "não há nenhum fix pin para o usuario usar no mapa" msgid "this location" msgstr "Visualizando um local" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "este tipo de problema local" @@ -4872,11 +5094,11 @@ msgstr "este tipo de problema local" msgid "today" msgstr "de hoje" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4884,14 +5106,24 @@ msgstr "" msgid "used map" msgstr "mapa usado" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "usuário é da mesmo concelho do problema - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "usuário é proprietário problema" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "E-mail já está na lista abusos" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Email adicionado a lista de abusos" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4953,35 +5185,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5051,6 +5283,36 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Relatos confirmados entre %s e %s" + +#~ msgid "Hide old" +#~ msgstr "Ocultar" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Incluir dados nao confirmados" + +#~ msgid "Invalid end date" +#~ msgstr "Invalido data final" + +#~ msgid "Invalid start date" +#~ msgstr "Data de inicio invalida" + +#~ msgid "No council" +#~ msgstr "Sem concelho" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Note que quando incluimos relatos não confirmados usamos a data em que o relatório foi criado, que pode não estar no mesmo mês em que o relatório foi confirmado de modo que os números podem estar alterados." + +#~ msgid "Show old" +#~ msgstr "Mostrar antigo" + +#~ msgid "Unfixed reports" +#~ msgstr "por arranjar" + +#~ msgid "Year" +#~ msgstr "Ano" + #~ msgid "%s ward, %s" #~ msgstr "%s ala, %s" @@ -5090,9 +5352,6 @@ msgstr[1] "" #~ msgid "No further action" #~ msgstr "Incapaz de ser resolvido" -#~ msgid "Not Responsible" -#~ msgstr "Nao responsavel" - #~ msgid "Or problems reported to:" #~ msgstr "Ou os problemas relatados para:" diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po index c61e5df0b3b..6fa95f3c500 100644 --- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Romanian (Romania) (https://www.transifex.com/mysociety/teams/12067/ro_RO/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "şi" @@ -32,6 +32,10 @@ msgstr "şi" msgid " or " msgstr "sau" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d modificări de %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s contacte – %s confirmate, %s neconfirmate" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s actualizări" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s chestionare trimise – %s completate (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s chestionare trimise – %s completate (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(cum ar fi graffiti, gunoaie depozitate ilegal, pavaj spart sau iluminat stradal)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -160,8 +164,8 @@ msgstr "" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Alege o categorie --" @@ -174,14 +178,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -190,16 +186,16 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -208,33 +204,49 @@ msgstr "" msgid "%s live problems" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my report by email/text" +msgstr "" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +msgid "No Let me confirm my update by email/text" +msgstr "" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +msgid "No let me sign in by email or text" +msgstr "" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -248,11 +260,16 @@ msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +msgid "Add email address" +msgstr "" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -275,11 +292,16 @@ msgstr "Adaugă o categorie nouă" msgid "Add option" msgstr "(opțional)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -289,23 +311,23 @@ msgstr "" msgid "Add user" msgstr "Adaugă utilizator" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -329,9 +351,10 @@ msgstr "" msgid "Alert me to future updates" msgstr "" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -340,12 +363,13 @@ msgstr "" msgid "All Reports" msgstr "" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -360,17 +384,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -407,7 +431,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -418,7 +443,7 @@ msgstr "" msgid "Area covered" msgstr "" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -432,7 +457,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "" @@ -444,7 +469,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -460,12 +485,16 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +msgid "Auto Response" +msgstr "" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -473,18 +502,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -498,20 +519,21 @@ msgstr "" msgid "Back" msgstr "" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "" +#, fuzzy +msgid "Ban user" +msgstr "Adaugă utilizator" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "" @@ -522,14 +544,10 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -542,8 +560,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -554,30 +573,35 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +msgid "Category and State" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -585,17 +609,17 @@ msgstr "" msgid "Category:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -603,10 +627,15 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +msgid "Change phone number" +msgstr "" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -628,19 +657,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "" @@ -668,18 +692,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "" @@ -694,16 +719,17 @@ msgid "Cobrand" msgstr "" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -711,7 +737,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -720,7 +746,7 @@ msgstr "" msgid "Confirm" msgstr "" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "" @@ -739,14 +765,10 @@ msgstr "" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -773,8 +795,8 @@ msgstr "" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "" @@ -792,43 +814,16 @@ msgstr "" msgid "Council contacts for %s" msgstr "" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "" @@ -849,37 +844,41 @@ msgstr "" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +msgid "Current token:" +msgstr "" + +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" msgstr "" #: templates/web/base/admin/bodies.html:9 @@ -892,14 +891,14 @@ msgstr "" msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "" @@ -911,12 +910,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -927,8 +926,8 @@ msgstr "" msgid "Deleted" msgstr "" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -944,6 +943,10 @@ msgstr "" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -956,6 +959,10 @@ msgstr "" msgid "Details:" msgstr "" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "" @@ -969,8 +976,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -979,7 +986,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -987,7 +994,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1007,11 +1014,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1031,9 +1038,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "" @@ -1043,33 +1051,33 @@ msgstr "" msgid "Edit body details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "" @@ -1090,7 +1098,6 @@ msgstr "" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1098,17 +1105,19 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +msgid "Email address (optional)" +msgstr "" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "" @@ -1117,19 +1126,18 @@ msgstr "" msgid "Email alert deleted" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "" @@ -1142,16 +1150,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/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +msgid "End Date" msgstr "" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1172,14 +1180,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "" @@ -1197,8 +1205,8 @@ msgstr "" msgid "Error" msgstr "" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1223,7 +1231,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1239,7 +1247,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "" @@ -1251,7 +1259,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 msgid "Extra Fields" @@ -1262,7 +1270,7 @@ msgstr "" msgid "Extra data:" msgstr "" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1292,21 +1300,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "" @@ -1314,7 +1323,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "" @@ -1323,7 +1332,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "" @@ -1331,8 +1340,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "" @@ -1352,7 +1361,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1372,8 +1381,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1406,12 +1419,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "" @@ -1419,7 +1432,7 @@ msgstr "" msgid "Going to send questionnaire?" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1427,6 +1440,14 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "" +#: templates/web/base/dashboard/index.html:93 +msgid "Group by %s" +msgstr "" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "" @@ -1447,21 +1468,25 @@ msgstr "" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +msgid "Here are some other nearby reports:" +msgstr "" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1482,21 +1507,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1508,7 +1530,7 @@ msgstr "" msgid "History" msgstr "" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "" @@ -1565,12 +1587,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "" @@ -1579,7 +1609,7 @@ msgstr "" 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1588,7 +1618,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1660,11 +1690,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1676,7 +1702,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1688,26 +1714,18 @@ msgstr "" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1726,7 +1744,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1751,12 +1769,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1782,18 +1795,14 @@ msgstr "" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1802,13 +1811,13 @@ msgstr "" msgid "List all reported problems" msgstr "" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "" #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1840,12 +1849,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1853,11 +1865,11 @@ msgstr "" msgid "MAP" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1869,11 +1881,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1893,45 +1905,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1949,9 +1961,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1962,19 +1974,23 @@ msgstr "" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1984,12 +2000,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2003,19 +2019,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2036,6 +2056,10 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +msgid "New phone number:" +msgstr "" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2065,18 +2089,19 @@ msgstr "" msgid "New reports" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2084,7 +2109,7 @@ msgstr "" msgid "Next" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2096,22 +2121,18 @@ msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "" @@ -2141,6 +2162,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "" @@ -2163,15 +2188,15 @@ msgstr "" msgid "None" msgstr "" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2190,7 +2215,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "" @@ -2204,10 +2229,6 @@ msgstr "" msgid "Note" msgstr "" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2235,37 +2256,46 @@ msgstr "" msgid "Now to submit your update…" msgstr "" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2304,23 +2334,29 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +msgid "Other wards" +msgstr "" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2338,19 +2374,19 @@ msgstr "" msgid "Parent" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "" @@ -2358,7 +2394,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2366,19 +2402,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "" @@ -2394,7 +2435,7 @@ msgstr "" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2420,12 +2461,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "" @@ -2447,25 +2493,33 @@ msgstr "" msgid "Please check the passwords and try again" msgstr "" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: 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:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "" @@ -2480,39 +2534,46 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: 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:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "" @@ -2521,55 +2582,61 @@ msgstr "" msgid "Please enter a valid email address" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +msgid "Please enter a valid email or phone number" +msgstr "" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "" @@ -2618,7 +2685,11 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +msgid "Please provide a duplicate ID or public update for this report." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2658,6 +2729,11 @@ msgstr "" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "" @@ -2667,7 +2743,7 @@ msgid "Please write your update here" msgstr "" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "" @@ -2676,15 +2752,15 @@ msgstr "" msgid "Posted anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "" @@ -2696,11 +2772,11 @@ msgstr "" msgid "Previous" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2717,7 +2793,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "" @@ -2741,21 +2817,21 @@ msgstr "" msgid "Problem %s sent to council %s" msgstr "" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "" @@ -2780,7 +2856,7 @@ msgstr "" msgid "Problems within %.1fkm of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2805,7 +2881,8 @@ msgstr "" msgid "Property address:" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "" @@ -2814,12 +2891,12 @@ msgstr "" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -2832,12 +2909,12 @@ msgstr "" msgid "Public response:" msgstr "" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "" @@ -2892,7 +2969,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2917,7 +2994,7 @@ msgstr "" msgid "Receive email when updates are left on this problem." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2931,7 +3008,7 @@ msgstr "" msgid "Recently reported problems" msgstr "" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2953,9 +3030,9 @@ msgstr "" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2963,12 +3040,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -2997,11 +3078,11 @@ msgstr "" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3016,17 +3097,17 @@ msgstr "" msgid "Report, view, or discuss local problems" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "" @@ -3040,27 +3121,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "" @@ -3069,8 +3150,8 @@ msgstr "" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3078,10 +3159,9 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "" @@ -3097,7 +3177,7 @@ msgstr "" msgid "Reports by destination" msgstr "" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3109,7 +3189,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3162,21 +3242,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3195,17 +3276,17 @@ msgstr "" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "" @@ -3215,21 +3296,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3240,12 +3321,12 @@ msgstr "" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3263,7 +3344,7 @@ msgstr "" msgid "Search Users" msgstr "" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "" @@ -3274,6 +3355,7 @@ msgid "Search:" msgstr "" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "" @@ -3286,7 +3368,7 @@ msgstr "" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3295,8 +3377,8 @@ msgstr "" msgid "Select a body" msgstr "" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "" @@ -3316,11 +3398,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "" @@ -3329,11 +3416,11 @@ msgid "Sent:" msgstr "" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3342,9 +3429,9 @@ msgid "Share" msgstr "" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3352,19 +3439,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3372,40 +3459,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3416,12 +3500,16 @@ msgstr "" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "" @@ -3437,7 +3525,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "" @@ -3450,15 +3538,19 @@ msgstr "" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3491,20 +3583,20 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +msgid "Start Date" msgstr "" #: templates/web/base/admin/body.html:73 @@ -3514,15 +3606,18 @@ msgstr "" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 msgid "State changed to:" msgstr "" @@ -3535,16 +3630,18 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 msgid "States" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "" @@ -3554,7 +3651,7 @@ msgstr "" msgid "Status" msgstr "" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "" @@ -3567,7 +3664,11 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +msgid "Subcategory" +msgstr "" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "" @@ -3584,18 +3685,19 @@ msgstr "" msgid "Subject:" msgstr "" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3636,7 +3738,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3644,25 +3746,30 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +msgid "Summary statistics" +msgstr "" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "" @@ -3670,14 +3777,14 @@ msgstr "" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "" @@ -3685,7 +3792,7 @@ msgstr "" msgid "Text only version" msgstr "" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3712,7 +3819,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "" @@ -3728,7 +3835,7 @@ msgstr "" msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3738,11 +3845,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "" @@ -3774,8 +3881,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3808,8 +3915,8 @@ msgstr "" msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "" @@ -3851,7 +3958,7 @@ msgstr "" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3876,7 +3983,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3887,33 +3994,37 @@ msgid "" " Names are not necessarily unique." msgstr "" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "" @@ -3921,7 +4032,7 @@ msgstr "" msgid "There were problems with your report. Please see below." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "" @@ -3976,26 +4087,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4012,7 +4131,7 @@ msgstr "" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4022,23 +4141,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" @@ -4049,7 +4168,7 @@ msgstr "" msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -4061,20 +4180,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" @@ -4086,44 +4206,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" msgstr "" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4136,18 +4248,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "" @@ -4162,7 +4275,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4171,15 +4288,11 @@ msgstr "" msgid "Unconfirmed" msgstr "" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "" @@ -4189,13 +4302,14 @@ msgstr "" msgid "Unknown error" msgstr "" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4220,12 +4334,12 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4233,16 +4347,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "" @@ -4256,18 +4370,18 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 msgid "Updated by %s (%s) at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "Updated by %s at %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4275,7 +4389,7 @@ msgid "Updated!" msgstr "" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "" @@ -4322,40 +4436,75 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +msgid "User added to abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +msgid "User already in abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +msgid "User in abuse table" msgstr "" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +msgid "User:" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +msgid "Verify email address" +msgstr "" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +msgid "Verify phone number" +msgstr "" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4377,12 +4526,7 @@ msgstr "" msgid "Viewing a problem" msgstr "" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4392,20 +4536,24 @@ msgstr "" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." +msgid "We found more than one match for that location." msgstr "" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "" @@ -4413,6 +4561,11 @@ msgstr "" msgid "We send it to the council on your behalf" msgstr "" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4422,8 +4575,8 @@ msgstr "" msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4451,7 +4604,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4474,6 +4627,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4490,16 +4647,7 @@ msgstr "" msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4514,7 +4662,7 @@ msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "" @@ -4527,7 +4675,7 @@ msgstr "" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4544,7 +4692,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4570,7 +4718,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4578,7 +4726,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4605,18 +4753,34 @@ msgstr "" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +msgid "You have successfully added your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" +#: templates/web/base/auth/change_phone.html:15 +msgid "You have successfully confirmed your phone number." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +msgid "You have successfully removed your phone number." +msgstr "" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +msgid "You have successfully verified your phone number." +msgstr "" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4640,36 +4804,42 @@ msgid "Your Reports" msgstr "Rapoartele dvs." #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +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 "" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4680,19 +4850,19 @@ msgstr "" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4703,8 +4873,8 @@ msgstr "" msgid "Your password has been changed" msgstr "" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "" @@ -4713,7 +4883,7 @@ msgstr "" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "" @@ -4722,25 +4892,39 @@ msgstr "" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +msgid "Your token has been generated" +msgstr "" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4757,8 +4941,8 @@ msgstr "" msgid "didn't use map" msgstr "" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4781,23 +4965,24 @@ msgstr "" msgid "less than a minute" msgstr "mai puţin de un minut" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "indisponibil" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "marcat ca nefiind responsabilitatea consiliului" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "sau găseşte-mă în mod automat" @@ -4837,7 +5022,7 @@ msgstr "" msgid "this location" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4845,11 +5030,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4857,14 +5042,22 @@ msgstr "" msgid "used map" msgstr "" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +msgid "user not in abuse list" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +msgid "user removed from abuse list" +msgstr "" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4934,7 +5127,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -4942,7 +5135,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" @@ -4950,7 +5143,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" @@ -4958,7 +5151,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -4966,7 +5159,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po index 103e4256d47..0e469a8d960 100644 --- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Russian (https://www.transifex.com/mysociety/teams/12067/ru/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "и" @@ -32,6 +32,10 @@ msgstr "и" msgid " or " msgstr "или" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d правок от %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s конт. органов местного самоуправления – %s подтвержд., %s неподтвержд." #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -75,7 +79,7 @@ msgstr "" "может касаться как неисправностей в вашем районе, так и неполадок, которые были зафиксированы в пределах определенного расстояния от заданной точки." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -89,6 +93,11 @@ msgstr "" msgid "%s live updates" msgstr "%s обновлений" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "Отправлено опросов: %s – получено ответов: %s (%s%%)" @@ -97,7 +106,7 @@ msgstr "Отправлено опросов: %s – получено отв msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© участники проекта OpenStreetMap" @@ -105,11 +114,6 @@ msgstr "© участники проекта \n" "Хотите добавить несколько MAPIT_TYPES в ваш файл конфигурации?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -219,33 +215,52 @@ msgstr "" msgid "%s live problems" msgstr "Актуальных неполадок: %s" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Нет Я хочу подтвердить свое обращение электронным письмом" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Нет Я хочу подтвердить свое обращение электронным письмом" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Нет Я хочу подтвердить обновление электронным письмом" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Нет Я хочу подтвердить обновление электронным письмом" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Нет, я хочу войти на сайт с помощью адреса эл. почты" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Нет, я хочу войти на сайт с помощью адреса эл. почты" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Да У меня есть пароль" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -262,11 +277,17 @@ msgid "Add a contact using the form below." msgstr "Добавить контакт с помощью формы." #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Добавить учреждение" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Добавить адрес эл. почты в черный список" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -289,11 +310,17 @@ msgstr "Добавить категорию" msgid "Add option" msgstr "(необязательно)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -303,23 +330,23 @@ msgstr "" msgid "Add user" msgstr "Добавить пользователя" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Добавлено: %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -343,9 +370,10 @@ msgstr "Уведомление «%d» отключено (создано: %s)" msgid "Alert me to future updates" msgstr "Оповещать меня об обновлениях в будущем" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -354,12 +382,13 @@ msgstr "" msgid "All Reports" msgstr "Все Отчеты" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Все обращения в виде CSV-файлов" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -375,17 +404,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Все отчеты" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Все отчеты с %s по %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -423,7 +452,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -434,7 +464,7 @@ msgstr "" msgid "Area covered" msgstr "Зона покрытия" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -448,7 +478,7 @@ msgid "Assign to competent body:" msgstr "Направить в учреждение, которое специализируется на решении подобных вопросов:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Назначить другую категорию:" @@ -460,7 +490,7 @@ msgstr "Направить во внешнее учреждение:" msgid "Assign to subdivision:" msgstr "Направить в подразделение:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -476,12 +506,17 @@ msgstr "Как правило, количество результатов, ко msgid "At the moment only searching for and looking at reports work." msgstr "Сейчас можно только искать и просматривать обращения" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Ответственности не несет" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -489,18 +524,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -514,20 +541,21 @@ msgstr "Ожидает модерации" msgid "Back" msgstr "Назад" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Добавить адрес эл. почты в черный список" +#, fuzzy +msgid "Ban user" +msgstr "Пометить пользователя" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Учреждения" @@ -538,14 +566,10 @@ msgstr "Учреждения" msgid "Body" msgstr "Учреждение" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Учреждение:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "По дате" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -558,8 +582,9 @@ msgstr "Письмо не пришло? Оно могло попасть в па msgid "Can't see the map? Skip this step" msgstr "Карта не отображается? Пропустите этот шаг" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -570,30 +595,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Категория" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Категория" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "Процент устранения неполадок в этой категории, которым больше 4 недель" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -601,17 +632,17 @@ msgstr "Процент устранения неполадок в этой ка msgid "Category:" msgstr "Категория:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Категория: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -619,10 +650,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Сменить пароль" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(номер телефона отсутствует)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -653,19 +690,14 @@ msgstr "" "Выберите название категории которое будет понятно не только другим пользователям (например, «Выбоина» или «Уличное освещение»), но и \n" " сотрудникам учреждения. Варианты названий отобразятся в раскрывающемся меню на странице подачи обращений." -#: templates/web/base/report/_inspect.html:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Нажмите здесь или введите дату в формате дд/мм/гггг" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Нажмите на карту, чтобы сообщить о проблеме" @@ -694,18 +726,19 @@ msgstr "Чтобы войти, пройдите по ссылке, указан #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Закрыто" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Закрыто органом самоуправления" @@ -720,16 +753,17 @@ msgid "Cobrand" msgstr "Кобренд" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Данные о кобренде:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Кобренд:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -737,7 +771,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфигурация" @@ -746,7 +780,7 @@ msgstr "Конфигурация" msgid "Confirm" msgstr "Подтвердить" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Подтвердить аккаунт" @@ -765,14 +799,10 @@ msgstr "Подтверждение" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Подтверждено" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Подтвержденные обращения с %s по %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -799,8 +829,8 @@ msgstr "Свяжитесь с командой" msgid "Coordinates:" msgstr "Координаты:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Не удалось найти пользователя" @@ -818,43 +848,16 @@ msgstr "Орган самоуправления" msgid "Council contacts for %s" msgstr "Контакты органа самоуправления для %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "Ссылка на орган самоуправления: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Орган самоуправления:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Подсчет" @@ -876,39 +879,44 @@ msgstr "Создать категорию" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Создать шаблон" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Создано" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Создано:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Статус" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -919,14 +927,14 @@ msgstr "В данный момент на сайте не зарегистрир msgid "Customer not contactable" msgstr "Невозможно связаться с покупателем" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Панель управления" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Вопрос решен подразделением в течение 5 рабочих дней" @@ -938,12 +946,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Удалить шаблон" @@ -954,8 +962,8 @@ msgstr "Удалить шаблон" msgid "Deleted" msgstr "Удалено" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -971,6 +979,10 @@ msgstr "Описание" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -983,6 +995,10 @@ msgstr "Дополнительная информация" msgid "Details:" msgstr "Дополнительная информация:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Передано" @@ -996,8 +1012,8 @@ msgstr "Карта не использовалась" msgid "Diligency prize league table" msgstr "Таблица самых активных пользователей" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -1006,7 +1022,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1014,7 +1030,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "У вас есть пароль на сайте %s?" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1034,11 +1050,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1062,9 +1078,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Редактировать" @@ -1074,33 +1091,33 @@ msgstr "Редактировать" msgid "Edit body details" msgstr "Редактировать информацию об учреждении" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Редактирование данных о неполадке: %d" @@ -1121,7 +1138,6 @@ msgstr "Редактор" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1129,17 +1145,20 @@ msgstr "Редактор" msgid "Email" msgstr "Адрес эл. почты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Адрес эл. почты добавлен в черный список" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Пароль (необязательно)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Создано уведомление по эл. почте" @@ -1148,19 +1167,18 @@ msgstr "Создано уведомление по эл. почте" msgid "Email alert deleted" msgstr "Уведомление по эл. почте удалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Этот адрес эл. почты уже находится в черном списке" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Адрес эл. почты:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Адрес эл. почты: %s" @@ -1177,8 +1195,8 @@ msgstr "" " Подробнее читайте в \n" " этой статье." +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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" @@ -1188,8 +1206,9 @@ msgstr "" " разные конечные точки (и метод отправки), отличающиеся от тех, которые соответствуют учреждению. Например: для некоторых категорий проблем обращения должны\n" " отправляться по эл. почте, а для других – с помощью сервиса Open311." -#: templates/web/base/admin/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Дата окончания:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1210,14 +1229,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Введите индекс ближайшего отделения связи, название улицы или регион" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Введите название ближайшей улицы и регион" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Введите пароль" @@ -1235,8 +1254,8 @@ msgstr "Подробно опишите проблему" msgid "Error" msgstr "Ошибка" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Всё" @@ -1261,7 +1280,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1277,7 +1296,7 @@ msgstr "Внешн." msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "Внешний URL" @@ -1289,7 +1308,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1301,7 +1320,7 @@ msgstr "Дополнительная информация:" msgid "Extra data:" msgstr "Дополнительная информация:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1331,21 +1350,22 @@ msgstr "Исправьте это, выбрав зону покрыти #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Исправлено" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Исправлено (орган самоуправления)" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Исправлено (пользователь)" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Пометить как удаленное" @@ -1353,7 +1373,7 @@ msgstr "Пометить как удаленное" msgid "Flag user" msgstr "Пометить пользователя" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Помечено" @@ -1362,7 +1382,7 @@ msgstr "Помечено" msgid "Flagged reports and users" msgstr "Помеченные обращения и профили пользователей" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Список помеченных профилей пользователей находится на странице Помеченное." @@ -1370,8 +1390,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Помечено:" @@ -1391,7 +1411,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Подробнее читайте в разделе Как в FixMyStreet используется инструмент Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1411,8 +1431,12 @@ msgstr "Пожелание перенаправлено во внешнее уч msgid "Frequently Asked Questions" msgstr "Часто задаваемые вопросы" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1445,12 +1469,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Поехали!" @@ -1458,7 +1482,7 @@ msgstr "Поехали!" msgid "Going to send questionnaire?" msgstr "Собираетесь отправить опрос?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1466,6 +1490,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "График устранения неполадки: статус/время" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "автор: %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Эта проблема решена?" @@ -1486,21 +1519,26 @@ msgstr "Помощь" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Фотографии происшествий поблизости, размещенные в недавних обращениях" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Привет, %s!" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Скрыто" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1521,21 +1559,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Скрыть старые" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Скрыть метки" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1547,7 +1582,7 @@ msgstr "" msgid "History" msgstr "История" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "На главную страницу" @@ -1606,6 +1641,10 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1614,6 +1653,10 @@ msgstr "" "Если одно местоположение обслуживают два и более учреждений, система сайта FixMyStreet объединяет похожие категории в единую запись,\n" " которая располагается в меню. Если вы хотите, чтобы это произошло, убедитесь, что вы используете одно и то же название категории для выбранных учреждений." +#: templates/web/base/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Если вы узнаете больше о статусе вашего обращения, обновите данные на нашем сайте." @@ -1622,7 +1665,7 @@ msgstr "Если вы узнаете больше о статусе вашего 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1631,7 +1674,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1713,11 +1756,7 @@ msgstr "Ура, новых писем нет!" msgid "Include reporter personal details" msgstr "Включить персональные данные заявителя" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Включить неподтвержденные обращения" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Нверно задано значение has_photo \"%s\"" @@ -1729,7 +1768,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1741,26 +1780,18 @@ msgstr "Внутренние заметки" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Неверно задано значение agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Неверно указана дата окончания" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Неверно задан формат: %s." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Неверно указана дата начала" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "Загляните в раздел Часто задаваемые вопросы: возможно, вы найдете там нужную информацию." @@ -1779,7 +1810,7 @@ msgstr "Юрисдикция неизвестна" msgid "Jurisdiction unknown" msgstr "Юрисдикция неизвестна" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1804,12 +1835,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1835,18 +1861,14 @@ msgstr "Последнее обновление:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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»)." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1855,13 +1877,13 @@ msgstr "" msgid "List all reported problems" msgstr "Все сообщения о неполадках в виде списка" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Загрузка..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1893,12 +1915,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1906,11 +1931,11 @@ msgstr "" msgid "MAP" msgstr "КАРТА" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1922,11 +1947,11 @@ msgstr "Карта" msgid "Mark as sent" msgstr "Пометить как отправленное" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Помечайте тех пользователей, за действиями которых вы хотите следить." -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1946,45 +1971,45 @@ msgstr "Сообщение внешнему учреждению:" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Не найден параметр jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Прошло модерацию в течение одного рабочего дня" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Месяц" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -2002,9 +2027,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2015,19 +2040,23 @@ msgstr "Имя" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Имя:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Имя: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2037,12 +2066,12 @@ msgstr "Ближайшая к метке дорога (генерируется msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Ближайший к метке почтовый индекс (генерируется автоматически): %s (%sm мил.)" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Ближайшая к метке дорога (генерируется автоматически с использованием сервиса Bing Maps): %s" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2058,19 +2087,24 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "Почти готово! Проверьте почту…" +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "Почти готово! Проверьте почту…" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Добавлено новое учреждение" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Добавлен новый контакт в категории" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2091,6 +2125,11 @@ msgstr "Новая заметка для DM:" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(номер телефона отсутствует)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2120,18 +2159,19 @@ msgstr "Новые неполадки в ведении учреждения: {{ msgid "New reports" msgstr "Новые обращения" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Новый статус" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Новый шаблон" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2139,7 +2179,7 @@ msgstr "" msgid "Next" msgstr "Далее" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2151,22 +2191,18 @@ msgstr "Далее" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Нет" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Нет учреждения" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Нет органа самоуправления" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Орган самоуправления не выбран" @@ -2196,6 +2232,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Результатов нет" @@ -2220,15 +2260,15 @@ msgstr "Нет группы поддержки" msgid "None" msgstr "Нет" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2251,7 +2291,7 @@ msgstr "Контакты не указаны" msgid "Not for my subdivision" msgstr "Не для моего подразделения" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Первое обращение по этой проблеме" @@ -2265,10 +2305,6 @@ msgstr "Первое обращение в органы самоуправлен msgid "Note" msgstr "Примечание" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Учтите, что когда система включает неподтвержденные обращения, регистрируется дата создания обращения. Она может отличаться от даты подтверждения обращения, поэтому эти данные могут быть неточными." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2296,37 +2332,46 @@ msgstr "Теперь обращение можно отправить…" msgid "Now to submit your update…" msgstr "Теперь обновление можно отправить…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "ОК" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Давний статус" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2365,23 +2410,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Другое" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "другие области" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2399,19 +2451,19 @@ msgstr "Страница не найдена" msgid "Parent" msgstr "Родительская" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Частичная" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Пароль (необязательно)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Пароль:" @@ -2419,7 +2471,7 @@ msgstr "Пароль:" msgid "Permalink" msgstr "Постоянная ссылка" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2428,19 +2480,25 @@ msgstr "" msgid "Phone Reporter:" msgstr "Обращение отправлено:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Номер телефона" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Номер телефона (необязательно)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Обращение отправлено:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Телефон:" @@ -2456,7 +2514,7 @@ msgstr "Телефон:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2482,12 +2540,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Фотографии происшествий поблизости, размещенные в недавних обращениях" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Поставить метку на карте" @@ -2509,25 +2572,34 @@ msgstr "Будьте вежливы, выражайте свои мысли кр msgid "Please check the passwords and try again" msgstr "Проверьте пароли и попробуйте еще раз" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Проверьте правильность написания адреса эл. почты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Проверьте правильность написания адреса эл. почты" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Выберите категорию" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Исправьте ошибки ниже" @@ -2545,39 +2617,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Будьте вежливы! Грубые, некорректные обращения к представителям органов самоуправления дискредитируют всех пользователей сервиса. " -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Введите текст сообщения" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Введите номер своего телефона" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Введите пароль" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Введите тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Введите действующий адрес эл. почты" @@ -2586,55 +2666,62 @@ msgstr "Введите действующий адрес эл. почты" msgid "Please enter a valid email address" msgstr "Введите действующий адрес эл. почты" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Введите номер своего телефона" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Введите дополнительную информацию" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Введите свой эл. адрес" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Введите адрес своей эл. почты" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Введите свое имя" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Введите свое имя" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Введите номер своего телефона" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Введите свою фамилию" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Напишите, как к вам обращаться" @@ -2683,7 +2770,12 @@ msgstr "" msgid "Please note:" msgstr "Внимание:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Поясните, почему вы решили заново отправить это обращение" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2723,6 +2815,11 @@ msgstr "Сообщите о статусе неполадки: проблема msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Напишите сообщение" @@ -2732,7 +2829,7 @@ msgid "Please write your update here" msgstr "Введите новые данные здесь" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Опубликовать" @@ -2741,15 +2838,15 @@ msgstr "Опубликовать" msgid "Posted anonymously at %s" msgstr "Опубликовано анонимно (%s)" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Автор публикации: %s, время публикации: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Автор публикации: %s (%s), время публикации: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Автор публикации: %s, время публикации: %s" @@ -2761,11 +2858,11 @@ msgstr "На базе платформы ключ API. С его помощью система помечает, что обращения были отправлены\n" " из установленного вами реурса FixMyStreet." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Некоторые фото недавних обращений" @@ -3527,15 +3636,20 @@ msgstr "Некоторое количество текста для локали msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "К сожалению, адреса по данному индексу относятся к коронным землям. Зона покрытия нашего ресурса на них не распространяется." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "Указана неверная ссылка" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "Указана неверная ссылка" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "При подтверждении вашего обращения произошла ошибка." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3568,20 +3682,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Дата начала:" #: templates/web/base/admin/body.html:73 @@ -3591,15 +3706,18 @@ msgstr "Дата начала:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Статус" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Сохранить изменения" @@ -3613,17 +3731,19 @@ msgstr "Сохранить изменения" msgid "State:" msgstr "Статус:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Статус" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Статистика" @@ -3633,7 +3753,7 @@ msgstr "Статистика" msgid "Status" msgstr "Статус" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Открыто (через опрос): %s" @@ -3646,7 +3766,12 @@ msgstr "Просмотр улиц" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Субкатегория: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Субкатегория: %s" @@ -3663,18 +3788,19 @@ msgstr "Тема" msgid "Subject:" msgstr "Тема:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Отправить" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3716,7 +3842,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3724,25 +3850,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Итог" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Отчеты об итогах" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Отчеты об итогах" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Результаты опроса" @@ -3750,14 +3882,14 @@ msgstr "Результаты опроса" msgid "Template «%s»" msgstr "Шаблон «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Шаблоны" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Текст" @@ -3765,7 +3897,7 @@ msgstr "Текст" msgid "Text only version" msgstr "Только текстовая версия" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3792,7 +3924,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Благодарим вас за отзыв" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Спасибо за предоставленное фото. Теперь нам нужно определить, где именно располагается неполадка. В поле выше введите название ближайшей улицы или индекс:" @@ -3808,7 +3940,7 @@ msgstr "Кажется, возникли трудности с загрузко msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Кажется, это местоположение не находится в ведении органа самоуправления. Возможно, им заведует другое учреждение или же вы указали место в другой стране. Попробуйте еще раз." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Это местоположение находится за пределами Великобритании. Повторите попытку." @@ -3818,11 +3950,11 @@ msgstr "Это местоположение находится за предел msgid "That postcode was not recognised, sorry." msgstr "Не удалось распознать индекс." -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Проблема помечена как отправленная." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Сейчас мы еще раз отправим это обращение." @@ -3860,8 +3992,8 @@ msgstr "" "Данные о юрисдикции необходимы только, если конечная точка используется для нескольких\n" " учреждений. Если учреждение привязано к отдельной конечной точке, оставьте это поле пустым." +#: templates/web/base/admin/body-form.html:101 #: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3898,8 +4030,8 @@ msgstr "Вам необходимо предоставить максимум и msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "В таблице самых активных пользователей показана деятельность тех редакторов, которые отредактировали наибольшее количество записей." -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Ошибка: %s" @@ -3941,7 +4073,7 @@ msgstr "Недавние проблемы, помеченные пользова msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Недавние обращения пользователей о проблемах в пределах местности: {{NAME}}" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Возможно, ссылка устарела или вы не полностью ее скопировали." @@ -3966,7 +4098,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Пользователь не смог определить местоположение неполадки на карте. Вместо этого он ввел данные о местности поблизости от неполадки." @@ -3979,33 +4111,38 @@ msgstr "" "Имя пользователя отображается в обращениях, которые не были помечены как анонимные.\n" " Имя может быть неуникальным." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Нет обращений." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "При загрузке страницы «Все обращения» произошла ошибка. Повторите попытку позже." #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "При загрузке страницы произошла ошибка. Повторите попытку позже." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Имя пользователя или пароль указаны неверно. Если вы не помните свой пароль или у вас его нет, заполните форму «Вход с помощью адреса эл. почты»." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Имя пользователя или пароль указаны неверно. Повторите попытку." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Имя пользователя или пароль указаны неверно. Если вы не помните свой пароль или у вас его нет, заполните форму «Вход с помощью адреса эл. почты»." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Не удалось загрузить новые данные. Повторите попытку." @@ -4013,7 +4150,7 @@ msgstr "Не удалось загрузить новые данные. Повт msgid "There were problems with your report. Please see below." msgstr "Не удалось загрузить обращение. Прочтите информациию ниже." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Не удалось загрузить новые данные. Прочтите информациию ниже." @@ -4078,26 +4215,34 @@ msgstr "" "В это учреждение будут отправляться только те обращения, неполадки в которых находятся на подведомственной территории.\n" " Чтобы получать обращения, учреждению необходимо иметь в ведении минимум одну область." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Эта информация является обязательной" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Это сайт разработчиков, поэтому в его функционировании иногда могут возникать сбои. База данных периодически удаляется." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4114,7 +4259,7 @@ msgstr "Эта проблема не была решена" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4124,23 +4269,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Это обращение ожидает модерации." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Это обращение на данный момент помечено как закрытое." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Это обращение на данный момент помечено как решенное." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Это обращение на данный момент помечено как открытое." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Это обращение было оставлено анонимно." -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Эта веб-страница также содержит фото неполадки, предоставленное пользователем." @@ -4151,7 +4296,7 @@ msgstr "Эта веб-страница также содержит фото не msgid "Time spent (in minutes):" msgstr "Времени потрачено (в минутах):" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Временной отрезок" @@ -4163,20 +4308,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Название" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Название:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "Введите индекс (%s) или название улицы и района, чтобы узнать, какие уведомления актуальны для вашего местоположения:" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Введите индекс или название улицы и района, чтобы узнать, какие уведомления актуальны для вашего местоположения:" @@ -4188,44 +4334,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "Просмотр точного местоположения данной проблемы на карте" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Всего" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Всего" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4238,18 +4376,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Повторите попытку" @@ -4264,7 +4403,11 @@ msgstr "Напишите нам:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4273,15 +4416,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Не подтверждено" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "обращения с неустраненными неполадками" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Неизв." -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Неизвестный тип уведомления" @@ -4291,13 +4430,14 @@ msgstr "Неизвестный тип уведомления" msgid "Unknown error" msgstr "Неизвестная ошибка" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Неизвестный идентификатор проблемы" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4322,12 +4462,12 @@ msgstr "Ниже представлены анонимно добавленны msgid "Update below added by %s at %s" msgstr "Ниже представлены новые данные, добавленные пользователем: %s, в: %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Обновить данные об учреждении" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Сортировка обновлений по статусу" @@ -4335,16 +4475,16 @@ msgstr "Сортировка обновлений по статусу" msgid "Update by {{name}}" msgstr "Обновлено: {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "В результате добавления данных статус проблемы изменен на: %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "В результате добавления данных проблема помечена как решенная" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "В результате добавления данных проблема помечена как заново открытая" @@ -4358,20 +4498,20 @@ msgstr "Обновление статусов" msgid "Updated" msgstr "Обновлено" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Автор публикации: %s (%s), время публикации: %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Автор публикации: %s, время публикации: %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4379,7 +4519,7 @@ msgid "Updated!" msgstr "Обновлено!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Обновления" @@ -4426,40 +4566,81 @@ msgstr "Использованная карта" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Адрес эл. почты добавлен в черный список" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Этот адрес эл. почты уже находится в черном списке" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Пометка удалена" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Аккаунт пользователя помечен" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "Вы в черном списке?" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "При поиске пользователей на сайте система находит соответствия между именами пользователей и адресами эл. почты." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Пользователи" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Пользователи" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Значения обновлены" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Ваш адрес эл. почты" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Ваш номер телефона" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4481,12 +4662,7 @@ msgstr "Просмотр местоположения" msgid "Viewing a problem" msgstr "Просмотр проблемы" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4496,20 +4672,25 @@ msgstr "Районы, которые находятся в ведении дан #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Мы нашли более одного соответствия этому местоположению. На странице отображается не более десяти результатов поиска. Если вы не нашли нужную информацию в результатах, попробуйте поиск по другим параметрам." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Не удалось найти это местоположение." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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;. Однако в нашей системе нет ее контактных данных. Если вам известен действующий адрес этой организации, напишите нам об этом." @@ -4517,6 +4698,12 @@ msgstr "Скорее всего, эта проблема находится в msgid "We send it to the council on your behalf" msgstr "Данные будут отправлены в орган самоуправления от вашего имени" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4526,8 +4713,8 @@ msgstr "Мы обязуемся использовать предоставле msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "Нам жаль, что проблему не удалось решить. Рекомендуем обратиться к представителям муниципальной власти." -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4555,7 +4742,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4578,6 +4765,10 @@ msgstr "Пожелание" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "С помощью поиска по запросу можно искать, используя параметр agency_responsible, чтобы ограничить результаты поиска до обращений, которые были отправлены в один административный орган. Условие поиска – идентификатор администрации, предоставленный сервисом MaPit." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "Хотите помочь проекту FixMyStreet? Наш код находится в открытом доступе и доступен на сайте fixmystreet.org." @@ -4594,16 +4785,7 @@ msgstr "Избегайте пунктуационных ошибок и не п msgid "Wrong location? Just click again on the map." msgstr "Неверно указано местоположение? Нажмите на карту еще раз." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Год" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4618,7 +4800,7 @@ msgstr "Год" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Да" @@ -4631,7 +4813,7 @@ msgstr "Да, у меня есть пароль" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Вы считаете, что эта проблема не нуждалась в модерации:" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4648,7 +4830,7 @@ msgstr "Вы собираетесь пожаловаться на это обн msgid "You can view the problem on this site." msgstr "Вы можете ознакомиться с проблемой на этом сайте." -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Вы можете добавить адрес эл. почты пользователя, который проявляет себя некорректно, в черный список. Все дальнейшие обращения этого пользователя не будут опубликованы и отправлены." @@ -4677,7 +4859,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Вы можете отметить учреждение как удаленное, если не хотите, чтобы его представители осуществляли деятельность на этом сайте." @@ -4685,7 +4867,7 @@ msgstr "Вы можете отметить учреждение как удал msgid "You declined; please fill in the box above" msgstr "Вы отказались; заполните форму выше" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4712,18 +4894,38 @@ msgstr "Был осуществлен выход из системы" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Вы определили местоположение проблемы на карте, используя зеленую метку. Если оно указано неверно, нажмите на карту еще раз." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Вы подтвердили свой адрес эл. почты." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Вы подтвердили свой адрес эл. почты." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Вы подтвердили свой адрес эл. почты." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Вы подтвердили свой адрес эл. почты." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Вы вошли в систему. Проверьте и подтвердите информацию в своем профиле:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Вы подтвердили свой адрес эл. почты." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Вы еще не создали ни одного обращения. Самое время начать!" @@ -4750,36 +4952,43 @@ msgid "Your Reports" msgstr "Ваши обращения" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Ваш эл. адрес" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Ваш адрес эл. почты" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +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 "Мы обязуемся использовать предоставленные вами персональные данные в соответствии с нашей политикой конфиденциальности" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4790,19 +4999,19 @@ msgstr "Ваше имя" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4813,8 +5022,8 @@ msgstr "Ваш пароль" msgid "Your password has been changed" msgstr "Ваш пароль был изменен" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Ваш номер телефона" @@ -4823,7 +5032,7 @@ msgstr "Ваш номер телефона" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Ваши обращения" @@ -4832,25 +5041,40 @@ msgstr "Ваши обращения" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Ваш пароль был изменен" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Ваши обновления" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4867,8 +5091,8 @@ msgstr "орган самоуправления" msgid "didn't use map" msgstr "карта не использовалась" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "напр.: ‘%s’ или ‘%s’" @@ -4891,23 +5115,24 @@ msgstr "последнее обновление: %s" msgid "less than a minute" msgstr "менее минуты" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "недоступн." #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "помечено как вопрос вне ответственности органа управления" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "или определите мое местоположение автоматически" @@ -4948,7 +5173,7 @@ msgstr "метка не отображается, так как карта не msgid "this location" msgstr "Просмотр местоположения" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "этот тип проблемы поблизости" @@ -4956,11 +5181,11 @@ msgstr "этот тип проблемы поблизости" msgid "today" msgstr "сегодня" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4968,14 +5193,24 @@ msgstr "" msgid "used map" msgstr "карта использована" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "пользователь проживает недалеко от обнаруженной неполадки на территории, подконтрольной органу самоуправления (%d)" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "неполадка находится в собственности пользователя" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Этот адрес эл. почты уже находится в черном списке" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Адрес эл. почты добавлен в черный список" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5053,7 +5288,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -5062,7 +5297,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" @@ -5071,7 +5306,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" @@ -5080,7 +5315,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -5089,7 +5324,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5179,6 +5414,45 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(адрес эл. почты в таблице пользователей, которые писали оскорбительные комментарии)" + +#~ msgid "By Date" +#~ msgstr "По дате" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Нажмите здесь или введите дату в формате дд/мм/гггг" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Подтвержденные обращения с %s по %s" + +#~ msgid "Hide old" +#~ msgstr "Скрыть старые" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Включить неподтвержденные обращения" + +#~ msgid "Invalid end date" +#~ msgstr "Неверно указана дата окончания" + +#~ msgid "Invalid start date" +#~ msgstr "Неверно указана дата начала" + +#~ msgid "No council" +#~ msgstr "Нет органа самоуправления" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Учтите, что когда система включает неподтвержденные обращения, регистрируется дата создания обращения. Она может отличаться от даты подтверждения обращения, поэтому эти данные могут быть неточными." + +#~ msgid "Show old" +#~ msgstr "Показать давние" + +#~ msgid "Unfixed reports" +#~ msgstr "обращения с неустраненными неполадками" + +#~ msgid "Year" +#~ msgstr "Год" + #~ msgid "" #~ "%s sends different categories of problem\n" #~ "to the appropriate council, so problems within the boundary of a particular council\n" @@ -5236,9 +5510,6 @@ msgstr[3] "" #~ msgid "No further action" #~ msgstr "Невозможно устранить" -#~ msgid "Not Responsible" -#~ msgstr "Ответственности не несет" - #~ msgid "Or problems reported to:" #~ msgstr "Или данные о неполадках, отправленные сюда:" diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po index 6b91c6e4828..94c585e50d6 100644 --- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Albanian (https://www.transifex.com/mysociety/teams/12067/sq/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "dhe" @@ -32,6 +32,10 @@ msgstr "dhe" msgid " or " msgstr "ose" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d përditësuar nga %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s kontaktet e kuvendit – %s konfirmuar, %s pa konfirmuar" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -75,7 +79,7 @@ msgstr "" "në një distancë të caktuar apo lokacion të caktuar." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -89,6 +93,11 @@ msgstr "" msgid "%s live updates" msgstr "%s përditësime ne kohë reale" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s pyetesoret jane derguar– %s pergjigjur (%s%%)" @@ -97,7 +106,7 @@ msgstr "%s pyetesoret jane derguar– %s pergjigjur (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© OpenStreetMap kontribuesit" @@ -105,11 +114,6 @@ msgstr "© OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(Defekt & lokacioni i defektit)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Email-i në tabelen abuzimi)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -145,7 +149,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(Si mbishkrime, pllaka të thyera , ose ndriçimit të rrugëve)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -167,8 +171,8 @@ msgstr "(dërguar te të dy)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS feed i problemeve brenda %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Zgjedh në kategori --" @@ -181,14 +185,6 @@ msgstr "--Zgjedh një template--" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -200,19 +196,19 @@ msgstr "" " Kjo eshte ndoshta arsyeja pse \"zona e mbuluar\" eshte e zbrazet (me poshte).
\n" " Ndoshta shtoni disa MAPIT_TYPES ne skedarin tuaj te konfigurimit?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid " %s reports %s" msgstr "" "Paraqit\n" "për" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -221,33 +217,52 @@ msgstr "" msgid "%s live problems" msgstr "%s probleme në kohë reale" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Jo Më lejo të konfirmoj raportin tim me email" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Jo Më lejo të konfirmoj raportin tim me email" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Jo Me lejoni te konfirmoj perditesimin me email" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Jo Me lejoni te konfirmoj perditesimin me email" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Jo më lejo të kyqem me email" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Jo më lejo të kyqem me email" + +#: templates/web/base/report/_inspect.html:177 msgid "Note: This report has been sent onwards for action. Any changes made won't be passed on." msgstr " Shënim: Ky raport është dërguar tutje për veprim. Çdo ndryshim i bërë tutje nuk do të kalojë." -#: templates/web/base/report/_inspect.html:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr " Shënim: Ky raport nuk është dërguar ende në vazhdim për veprim. Çdo ndryshim i bërë nuk mund të kalohet." -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Po Unë kam një fjalëkalim" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -263,11 +278,17 @@ msgid "Add a contact using the form below." msgstr "Shto nje kontakt duke perdorur formularin e meposhtem." #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Shto trup" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "bllokoemail adresen" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -290,11 +311,17 @@ msgstr "Shto një kategori të re" msgid "Add option" msgstr "Opsionale" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Pa numër të telefonit)" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "Shto në listën e ngushtë" @@ -304,23 +331,23 @@ msgstr "Shto në listën e ngushtë" msgid "Add user" msgstr "Shto përdorues" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "Shto/përditëso kategoritë e problemeve" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "Shto/përditëso prioritetet e përgjigjeve" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "Shto/Përditëso përgjigjet nga template" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Shtoi %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "Duke shtuar këtë raport në listën tuaj do të heqni atë nga lista %s''s e ngushtë." @@ -344,9 +371,10 @@ msgstr "Notifikimi %d i ndalur (krijuar %s)" msgid "Alert me to future updates" msgstr "Me paralajmero per perditesime ne te ardhmen" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -355,12 +383,13 @@ msgstr "" msgid "All Reports" msgstr "Te gjitha Raportimet" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Të gjitha raportet si CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Të gjitha kategoritë" @@ -376,17 +405,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Te gjitha raportimet" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Te gjitha raportimet ne mes te %s dhe %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -424,7 +453,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "Jeni te sigurte qe doni te anuloni këtë upload?" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "A jeni të sigurtë?" @@ -435,7 +465,7 @@ msgstr "A jeni të sigurtë?" msgid "Area covered" msgstr "Hapesire e mbuluar" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "Zona:" @@ -449,7 +479,7 @@ msgid "Assign to competent body:" msgstr "Caktoja drejtorisë përkatëse: " #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Cakto per kategori te ndryshme:" @@ -461,7 +491,7 @@ msgstr "Caktoja një drejtorije të jashtme:" msgid "Assign to subdivision:" msgstr "Cakto per nenndarje:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "Cakto përdorues për ëonat" @@ -477,12 +507,17 @@ msgstr "Në shumicën %d kërkesave janë kthyer në çdo pyetje. Kërkesat e kt msgid "At the moment only searching for and looking at reports work." msgstr "Per momentin funksionon vetem kerkimi dhe shikimi i raportimeve." -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "Përdoruesit e stafit te autorizuar mund të jenë të lidhur me kategoritë në të cilat operojnë." -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Përgjigje-Automatike:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "Përgjigje-Automatike:" @@ -490,18 +525,10 @@ msgstr "Përgjigje-Automatike:" msgid "Available categories" msgstr "Kategoritë në dispozicion" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "Shmangni të dhënat personale dhe targat e automjeteve" @@ -515,20 +542,21 @@ msgstr "Në pritje të vlerësimit" msgid "Back" msgstr "Prapa" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "Prapa te të gjitha raportet" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "bllokoemail adresen" +#, fuzzy +msgid "Ban user" +msgstr "Flamuri i perdoruesit" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Drejtoritë" @@ -539,14 +567,10 @@ msgstr "Drejtoritë" msgid "Body" msgstr "Drejtori" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Drejtori" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Nga Data" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -559,8 +583,9 @@ msgstr "Nuk mund ta gjeni emailin tonë? Kontrolloni folderin spam ne e-mail. Kj msgid "Can't see the map? Skip this step" msgstr "Nuk mund te shihni harten? Kaloni kete hap" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Kategoritë" @@ -571,30 +596,36 @@ msgstr "Kategoritë:" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategoria" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategoria" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategoria u ndryshua nga '%s' në '%s'" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "Norma e rregullimit të kategorive për problemet > 4 javë" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -602,17 +633,18 @@ msgstr "Norma e rregullimit të kategorive për problemet > 4 javë" msgid "Category:" msgstr "Kategoria:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategoria: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "Ndrysho email" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "Ndrysho email adresën" @@ -620,10 +652,16 @@ msgstr "Ndrysho email adresën" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Nderro fjalekalimin" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Pa numër të telefonit)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "Kontrolloni aty ku inspektimi kërkohet në qoftë se raportet në këtë kategori duhet të inspektohen përpara se të dërgohet." @@ -655,19 +693,14 @@ msgstr "" "Zgjidhni një emër të kategorisë emër që ka kuptim për publikun (p.sh., \"\", \"ndriçimi publik\",\"Rruga Lokale\"), por është i kuptueshëm edhe për\n" "Drejtorinë. Këto do të shfaqen në drop-down menynë në faqen Raportimit të problemeve." -#: templates/web/base/report/_inspect.html:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Kliko ketu ose shkruaj si dd/mm/yyyy" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Kliko ne harte per te raportuar nje problem" @@ -696,18 +729,19 @@ msgstr "Klikoni linkun në emailin tonë konfirmues për tu kyçur." #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Mbyllur" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Mbyllur nga këshilli." @@ -722,16 +756,17 @@ msgid "Cobrand" msgstr "" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -739,7 +774,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurimi" @@ -748,7 +783,7 @@ msgstr "Konfigurimi" msgid "Confirm" msgstr "Konfirmo" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Konfirmo llogarine" @@ -767,14 +802,10 @@ msgstr "Konfirmimi" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "E konfirmuar" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Raportet e konfirmuara ne mes te %s dhe %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -801,8 +832,8 @@ msgstr "Kontakto ekipin" msgid "Coordinates:" msgstr "Koordinatat:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Nuk mund te gjeni perdoruesin" @@ -820,43 +851,16 @@ msgstr "Këshilli" msgid "Council contacts for %s" msgstr "Kontaktet e kuvendit për %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Kuvendi:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Numëro" @@ -878,40 +882,45 @@ msgstr "Krijo kategorine" msgid "Create priority" msgstr "Krijo prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "Krijo raport/përditësim në emër të shfrytëzuesit" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "Krijo raporte/përditësime si Kuvend Komunal" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "Krijo raport/përditësim në emër të shfrytëzuesit" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Krijo template" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "U krijua" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "U krijua:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Gjendja aktuale" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -922,14 +931,14 @@ msgstr "Aktualisht asnje grup nuk eshte krijuar." msgid "Customer not contactable" msgstr "Klienti nuk mund të kontaktohet" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Paneli" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Trajtohet nga nën-drejtoritë brenda 5 ditëve të punës" @@ -942,12 +951,12 @@ msgstr "" msgid "Default priority" msgstr "Krijo prioritet" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Fshije template" @@ -958,8 +967,8 @@ msgstr "Fshije template" msgid "Deleted" msgstr "E fshirë" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -975,6 +984,10 @@ msgstr "Përshkrim" msgid "Description:" msgstr "Përshkrimi:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -987,6 +1000,10 @@ msgstr "Detaje" msgid "Details:" msgstr "Detaje:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Transferuar" @@ -1000,8 +1017,8 @@ msgstr "Nuk e përdori hartën" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -1010,7 +1027,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Mos dërgo notifikime me email ne komentet e marra nga lajmëruesi i problemit" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1018,7 +1035,7 @@ msgstr "Mos dërgo notifikime me email ne komentet e marra nga lajmëruesi i pro msgid "Do you have a %s password?" msgstr "A keni vondosur nje %s fjalëkalim ?" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1038,11 +1055,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "Merr dhe lësho fotot këtu ose kliko për të ngarkuar foto" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1065,9 +1082,10 @@ msgstr "Lëvizje drejtë Lindjes/Veriut:" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Përditëso" @@ -1077,33 +1095,33 @@ msgstr "Përditëso" msgid "Edit body details" msgstr "Përditëso detajet:" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "Përditëso detajet e përdoruesit" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "Përditëso autorizimet e përdoruesit" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "Përditëso kategorinë e raporteve" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "Përditëso prioritetin e raportit" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "Përditëso raportet" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Përditëso problemin %d" @@ -1124,7 +1142,6 @@ msgstr "Editor" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1132,17 +1149,20 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Emaili u shtua te lista e abuzimeve" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "Email adresa" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Email adresa" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Notifikimi me email u krijua" @@ -1151,19 +1171,18 @@ msgstr "Notifikimi me email u krijua" msgid "Email alert deleted" msgstr "Notifikimi me email u fshi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Emaili tanimë është në listë e abuzuesve" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Email: %s" @@ -1176,16 +1195,17 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Data e fundit:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1206,14 +1226,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Shkruani një emër të rrugës apo zonë" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Shkruani emrin e rrugës pranë jush dhe zonës" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Shkruaj fjalekalimin" @@ -1231,8 +1251,8 @@ msgstr "Pershkruaje problemin" msgid "Error" msgstr "Gabim" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Çdo gjë" @@ -1257,7 +1277,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "Shpjego çfarë është gabim" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1273,7 +1293,7 @@ msgstr "i jashtëm" msgid "External ID" msgstr "ID e jashtme" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "URL i jashtëm" @@ -1285,7 +1305,7 @@ msgstr "Drejtori e jashtme" msgid "External team" msgstr "Ekipi i jashtëm" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1297,7 +1317,7 @@ msgstr "Ekstra detajet" msgid "Extra data:" msgstr "Te dhena shtese:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "Ekstra detajet" @@ -1327,21 +1347,22 @@ msgstr "Rregulloni këtë duke zgjedhur një zonë të mbuluar flagged page." msgstr "Përdoruesit e shënjuar janë të listuar në faqen e shënimeve." @@ -1366,8 +1387,8 @@ msgstr "Përdoruesit e shënjuar janë të listuar në faqen e sh msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Përdoruesit e shënjuar nuk janë të kufizuar në asnjë mënyrë. Kjo është vetëm një listë e përdoruesve që kanë qenë të shënuar për vëmendje të mëtutjeshme." -#: templates/web/base/admin/report_edit.html:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Shënjuar:" @@ -1387,7 +1408,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Për më shumë informata, shih Si e përdorë FixMyStreet platformën Mapit ." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1407,8 +1428,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Pyetjet më të shpeshta" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1441,12 +1466,12 @@ msgstr "Jemi të kënaqur që është regulluar!" #: 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Vazhdo" @@ -1454,7 +1479,7 @@ msgstr "Vazhdo" msgid "Going to send questionnaire?" msgstr "Do dërgoni pyetsorin?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "Lejoni akses për administratorin" @@ -1462,6 +1487,15 @@ msgstr "Lejoni akses për administratorin" msgid "Graph of problem creation by status over time" msgstr "Grafi i problemeve të krijuara në bazë të statusit gjatë kohës" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "nga %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "A ka qene i rregulluar ky problem?" @@ -1482,21 +1516,26 @@ msgstr "Ndihmë" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "Na ndihmoni të zgjedhim problemin tuaj më shpejtë duke na dhënë disa të dhëna më shumë. Këto të dhëna shtesë nuk publikohen online." +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Fotografite e raporteve te fundit" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Pershendetje %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "E fshehur" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1517,21 +1556,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Fshih të vjetrat" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Fshih shenjën" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1543,7 +1579,7 @@ msgstr "" msgid "History" msgstr "Historia" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Kryefaqja" @@ -1600,12 +1636,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 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ë informata për gjendjën e problemit tuaj, ju lutem kthehuni në faqe dhe leni një përditësim." @@ -1614,7 +1658,7 @@ msgstr "Nëse merrni më shumë informata për gjendjën e problemit tuaj, ju lu 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 ju dëshironi vetëm që ky prioritet të jetë një alternativë për kategori të veçanta, merr ato këtu. By default ata do të tregojnë për të gjitha kategoritë" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "Nëse ju vetëm dëshironi që kjo template të jetë një alternativë për kategori të veçanta, merr ato këtu. By default ajo do të tregojë të gjitha kategoritë." @@ -1623,7 +1667,7 @@ msgstr "Nëse ju vetëm dëshironi që kjo template të jetë një alternativë msgid "If you submit a problem here the problem will not be reported to the council." msgstr "Në qoftë se ju do të paraqitni një problem këtu ,problemi do të nuk të raportohet në këshill." -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1697,11 +1741,7 @@ msgstr "Inboksi zero, ja ku erdhëm!" msgid "Include reporter personal details" msgstr "Perfshire te dhenat personale te raportuesit" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Perfshire raportimet e pakonfirmuara" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Gabim ka_foto value \"%s\"" @@ -1713,7 +1753,7 @@ msgstr "" msgid "Inspection required" msgstr "Inspektimi kërkohet" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "Instrukto kontraktorët të rregullojnë problemet" @@ -1725,26 +1765,18 @@ msgstr "Shenim i brendshem" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Vlerë agency_responsible e gabuar %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Data e fundit jovalide" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Format jo i vlefshëm %s i specifikuar." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "Lokacion jo valid. Lokacioni i ri duhet të mbulohet nga i njëjti këshill." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Data e fillimit jovalide" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1765,7 +1797,7 @@ msgstr "Juridiksioni i panjohur" msgid "Jurisdiction unknown" msgstr "Juridiksion i pa njohur" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1790,12 +1822,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1821,18 +1848,14 @@ msgstr "Perditesimi fundit:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "I përditësuar kohët e fundit" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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 "Lini bosh këtë në qoftë se të gjitha raportet në këtë organ duhet të dërgohen duke përdorur të njëjtën metodë të dërgimit (p.sh., \"%s\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1841,13 +1864,13 @@ msgstr "" msgid "List all reported problems" msgstr "Listo te gjitha problemet e raportuar" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Duke ngarkuar..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1879,12 +1902,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1892,11 +1918,11 @@ msgstr "" msgid "MAP" msgstr "HARTA" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "Menaxhoni listën e shkurtë" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1908,11 +1934,11 @@ msgstr "Harta" msgid "Mark as sent" msgstr "Shëno si të dërguar" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1932,45 +1958,45 @@ msgstr "Mesazh për një drejtori të jashtme" msgid "Missing bodies:" msgstr "Mungojnë drejtori:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Mungesë juridiksioni_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "Mesatare" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "Raportet e detajuara mesatare" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "Moderoni këtë raport" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Moderuar me divizion brenda një ditë pune" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Muaji" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "Më të komentuarat" @@ -1988,9 +2014,9 @@ msgstr "Më të komentuarat" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2001,19 +2027,24 @@ msgstr "Emri" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Emri:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Emri: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "Shko tek ky problem" +#: templates/web/base/report/_inspect.html:39 +#, fuzzy +msgid "Nearest calculated address:" +msgstr "Email adresa e re " + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2023,12 +2054,12 @@ msgstr "Rruga më e afërt me emërtim e llogaritur nga pin në hartë (gjeneroh msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Kodi postar më i afërt nga pin i vendosur në hartë (gjenerohet automatikisht): %s (%sm jasht)" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Rruga më e afërt e llogaritur nga pin në hartë (gjenerohet automatikisht nga Bing Maps): %s" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2042,20 +2073,25 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "Gati e përfunduar! Tani kontrolloni emailin tuaj" +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "Gati e përfunduar! Tani kontrolloni emailin tuaj" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 #, fuzzy msgid "New" msgstr "Më e reja" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Drejtori e re e shtuar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Kategori e re e kontakteve e shtuar" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "Email adresa e re " @@ -2076,6 +2112,11 @@ msgstr "Shënim i ri për DM" msgid "New password:" msgstr "Fjalëkalim i ri" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Pa numër të telefonit)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2105,18 +2146,19 @@ msgstr "Probleme të reja brenda kufinjëve në RegulloRRugënTime" msgid "New reports" msgstr "Raportime te reja" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Gjendje e re" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Shabllon i ri" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "Më e reja" @@ -2124,7 +2166,7 @@ msgstr "Më e reja" msgid "Next" msgstr "Tjetra" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2136,22 +2178,18 @@ msgstr "Tjetra" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Jo" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Ska zonë" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Ska drejtori" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Ska council" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Asnjë council e zgjedhur" @@ -2181,6 +2219,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Nuk u kthye asnje rezultat" @@ -2203,15 +2245,15 @@ msgstr "Asnje perkrahes" msgid "None" msgstr "Asnje" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2230,7 +2272,7 @@ msgstr "E pa kontaktueshme" msgid "Not for my subdivision" msgstr "Jo per nenndarjet e mia" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Nuk eshte raportuar me pare" @@ -2244,10 +2286,6 @@ msgstr "E pa raportuar tek council" msgid "Note" msgstr "Shenim" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2275,37 +2313,46 @@ msgstr "" msgid "Now to submit your update…" msgstr "Tani ju mund te paraqitni perditesimin…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "Ne rregull" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Gjendje e vjeter" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "Më i vjetri" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2345,23 +2392,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Tjera" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "zona tjera:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2379,19 +2433,19 @@ msgstr "Faqja nuk u gjet" msgid "Parent" msgstr "Burim" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "I pjesshem" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Fjalekalimi (opsionale)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Fjalekalimi:" @@ -2399,7 +2453,7 @@ msgstr "Fjalekalimi:" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "Lejet" @@ -2408,19 +2462,25 @@ msgstr "Lejet" msgid "Phone Reporter:" msgstr "Raportuar:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Numri i telefonit" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Numri i telefonit (opsionale)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Raportuar:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefoni:" @@ -2436,7 +2496,7 @@ msgstr "Telefoni:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2462,12 +2522,17 @@ msgstr "Foto" msgid "Photos of recent nearby reports" msgstr "Fotografite e raporteve te fundit" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Vendose shenjen ne harte" @@ -2489,25 +2554,34 @@ msgstr "Ju lutem te jeni te sjellshem, korrekt dhe te sakte. " msgid "Please check the passwords and try again" msgstr "Ju lutem kontrolloni fjalekalimin dhe provoni perseri" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Ju lutem kontrolloni email adresen tuaj nese eshte e sakte" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Ju lutem kontrolloni email adresen tuaj nese eshte e sakte" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Ju lutem zgjedhni kategorine" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Ju lutem përmirësoni gabimet e mëposhtme" @@ -2522,39 +2596,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Ju lutem shkruaj nje mesazh" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Ju lutem shkruani numrin e telefonit tuaj" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "Ju lutem shkruani emrin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "Ju lutem jepni një emër për këtë drejtori" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Ju lutem shkruaj fjalekalimin" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Ju lutem shkruaj subjektin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Ju lutem shkruaj nje email valid" @@ -2563,55 +2645,62 @@ msgstr "Ju lutem shkruaj nje email valid" msgid "Please enter a valid email address" msgstr "Ju lutem shkruani një email adresë valide" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Ju lutem shkruani numrin e telefonit tuaj" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Ju lutem shkruaj disa te dhena" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Ju lutem shkruani email-in tuaj" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Ju lutem shkruani email adresen tuaj" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Ju lutem shkruani emrin tuaj" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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 lutem shkruani emrin tuaj të plotë, council i cili kërkon këtë informatë - nëse nuk doni që emri juaj të shihet në faqe, largoni etiketimin nga kutia e mëposhtme" #: perllib/FixMyStreet/App/Controller/Contact.pm:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Ju lutem shkruani emrin tuaj" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Ju lutem shkruani numrin e telefonit tuaj" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Ju lutem shkruani emrin tuaj te dyte (opsionale) " -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Ju lutem shkruani titullin tuaj" @@ -2660,7 +2749,12 @@ msgstr "" msgid "Please note:" msgstr "Ju lutem vini re:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Ju lutem sigorni një përditësim publik për këtë raport" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "Ju lutem sigorni një përditësim publik për këtë raport" @@ -2700,6 +2794,11 @@ msgstr "Ju lutem tregoni nëse problemi është zgjedhur apo jo " msgid "Please upload an image only" msgstr "Ju lutem ngarkoni vetëm një fotografi" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Ju lutem shkruani nje mesazh" @@ -2709,7 +2808,7 @@ msgid "Please write your update here" msgstr "Ju lutem shkruani perditesimin tuaj ketu" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Posto" @@ -2718,15 +2817,15 @@ msgstr "Posto" msgid "Posted anonymously at %s" msgstr "Postuar ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Postuar nga %s ne %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Postuar nga %s (%s) ne %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Postuar nga %s ne %s" @@ -2738,11 +2837,11 @@ msgstr "" msgid "Previous" msgstr "Paraprak" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "Prioritetet" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "Prioritet" @@ -2759,7 +2858,7 @@ msgstr "Privatësia dhe cookiesa" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privat" @@ -2783,21 +2882,21 @@ msgstr "Problemi %s u konfirmua" msgid "Problem %s sent to council %s" msgstr "Problemi %s është dërguar tek council %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Nën-ndarja me shtete" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problemi eshte shenuar si i hapur." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Ndryshim i gjendjes se problemit bazuar ne rezultatet e anketes" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemet" @@ -2824,7 +2923,7 @@ msgstr "Problemet e raportuara se fundi ne FixMyStreet" msgid "Problems within %.1fkm of %s" msgstr "Problemet brenda %.1fkm te ketij lokacioni" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2850,7 +2949,8 @@ msgstr "Problemi përbrenda %s, %s" msgid "Property address:" msgstr "Adresa e prones:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ofro nje perditesim" @@ -2859,12 +2959,12 @@ msgstr "Ofro nje perditesim" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Dhënia e emrit dhe fjalëkalimit janë opcionale, por nëse jepni këto të dhëna do të lehtësoj raportimin e problemeve, përditsimin dhe menaxhimin e raporteve tuaja." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Dhënia e fjalëkalimit është opcional, por duke dhënë atë do të ju lejohet që më lehtë të raportoni problemin, bëni përditësim dhe menaxhoni raportet tuaja." @@ -2877,12 +2977,12 @@ msgstr "" msgid "Public response:" msgstr "Pergjigje publike:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "Përditësim publik." #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Publiko fotografine" @@ -2937,7 +3037,7 @@ msgstr "RSS feed i %s, brenda lagjes %s" msgid "RSS feed of nearby problems" msgstr "RSS feed i problemeve ne afersi" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2962,7 +3062,7 @@ msgstr "RSS feed per te rejat rreth ketij problemi" msgid "Receive email when updates are left on this problem." msgstr "Prano email kur ka perditesime te ketij problemi" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "Pranuar nga momente më vonë" @@ -2976,7 +3076,7 @@ msgstr "Problemet lokale së fundmi" msgid "Recently reported problems" msgstr "Problemet e raportuara së fundmi" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "Përditësuar së fundmi" @@ -3000,9 +3100,9 @@ msgstr "Largo flamurin" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "Fshije nga lista e ngushtë" @@ -3010,12 +3110,16 @@ msgstr "Fshije nga lista e ngushtë" msgid "Remove from site" msgstr "Fshije nga website" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Largo fotografine (nuk mund te kthehet!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "Përgjigju përdoruesit:" @@ -3044,11 +3148,11 @@ msgstr "Raporto abuzimin" msgid "Report as" msgstr "Raporto si" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Raporto ne %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3063,17 +3167,17 @@ msgstr "Raportoni problemin tuaj" msgid "Report, view, or discuss local problems" msgstr "Raporto,shiqo apo diskuto problemet lokale" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Raportuar ne menyre anonime te %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Të raportuara më parë" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Raportuar nga %s ne %s" @@ -3087,27 +3191,27 @@ msgstr "Raportuar nga:" msgid "Reported in the %s category" msgstr "Raportuar ne kategorine %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Raportuar ne kategorine %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Raportuar ne kategorine %s nga %s ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Raportuar nepermjet %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Raportuar nepermjet %s nga %s ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Raportuar nepermjet %s ne kategorine %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Raportuar nepermjet %s ne kategorine %s ne %s" @@ -3116,8 +3220,8 @@ msgstr "Raportuar nepermjet %s ne kategorine %s ne %s" msgid "Reported:" msgstr "Raportuar:" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3125,10 +3229,9 @@ msgstr "Raportuar:" msgid "Reporting a problem" msgstr "Raportimi i nje problemi" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Raportimet" @@ -3145,7 +3248,7 @@ msgstr "Raporti është duke pritur për aprovim" msgid "Reports by destination" msgstr "Raportuar nga %s ne %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "Raportet e bëra nga përdoruesit e besueshëm do të dërgohen tek drejtoria përgjegjëse pa u kontrolluar më parë." @@ -3157,7 +3260,7 @@ msgstr "" msgid "Reports published" msgstr "Raporti u publikua" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3213,21 +3316,22 @@ msgid "Response Templates" msgstr "Shabllonet e përgjigjeve" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "Shabllone të përgjigjjeve për" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3246,17 +3350,17 @@ msgstr "Operatori i rrugës për emrin e kësaj rruge (rrjedh nga numri i refer msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Operatori i rrugës për emrin e kësaj rruge (nga OpenStreetMap)." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rrotullo Majtas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Rrotullo Djathtas" @@ -3266,21 +3370,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "Rrotullimi i kësaj foto do të heq dorë nga ndryshimet e paruajtura në raport." #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelitore" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3291,12 +3395,12 @@ msgstr "Ruaj ndryshimet" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 msgid "Save with a public update" msgstr "Ruaje me një përditësim për publikun" #. ("This is followed by a progress count, e.g. 3/5") -#: templates/web/base/js/translation_strings.html:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3315,7 +3419,7 @@ msgstr "Kërko Raportet" msgid "Search Users" msgstr "Kerko Perdoruesit" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Kerko raportet" @@ -3326,6 +3430,7 @@ msgid "Search:" msgstr "Kerko:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Gjate kerkimit nuk eshte gjetur asnje raport." @@ -3338,7 +3443,7 @@ msgstr "Gjate kerkimit nuk eshte gjetur asnje perdorues." msgid "See our privacy policy" msgstr "Shiqo rregulloren tonë të privatësisë" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3347,8 +3452,8 @@ msgstr "" msgid "Select a body" msgstr "Zgjedh një drejtori" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Zgjedh nje zone" @@ -3368,11 +3473,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "Dërgo raportin prapa" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Dërgo tek %s %s më vonë" @@ -3381,11 +3491,11 @@ msgid "Sent:" msgstr "Dërgo:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Shërbim:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "Vendos tek lokacioni im i tanishëm" @@ -3394,9 +3504,9 @@ msgid "Share" msgstr "Shpërndajë" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "Lista e ngushtë" @@ -3404,19 +3514,19 @@ msgstr "Lista e ngushtë" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "Përzgjedhur" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "Përzgjedhur nga %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3424,40 +3534,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Publiko emrin tim" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Shfaq te vjetrat" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Shfaq shenjat" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3468,12 +3575,17 @@ msgstr "Kyqu" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Kyçuni me email, duke siguruar fjalëkarim të ri. Kur klinoni në linkun në emailin tuaj, fjalëkalimi juaj do të përditësohet." +#: templates/web/base/auth/general.html:96 +#, fuzzy +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "Kyçuni me email, duke siguruar fjalëkarim të ri. Kur klinoni në linkun në emailin tuaj, fjalëkalimi juaj do të përditësohet." + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Kyqu ose krijo nje llogari" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Shkyqu" @@ -3489,7 +3601,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Disa foto nga raportet më të fundit" @@ -3502,15 +3614,20 @@ msgstr "Teksti për të lokalizuar" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Na falni, ky duhet të jetë Crown kod postar i pavarur, të cilin ne nuk e mbulojmë." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "Na vjen keq, ai nuk ishte link valid" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "Na vjen keq, ai nuk ishte link valid" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "Na vjen keq, është nje problem me konfirmimin e raportit tuaj." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3543,20 +3660,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "Na vjen keq, ju nuk keni leje për të bërë atë." -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "Ndaj sipas" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "Përdoruesit e stafit kanë leje për të hyrë brënda tek admin." -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "Stafi:" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Data e Fillimit:" #: templates/web/base/admin/body.html:73 @@ -3566,15 +3684,18 @@ msgstr "Data e Fillimit:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Gjendje" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Ruaj ndryshimet" @@ -3588,17 +3709,19 @@ msgstr "Ruaj ndryshimet" msgid "State:" msgstr "Gjendje:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Gjendje" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistikat" @@ -3608,7 +3731,7 @@ msgstr "Statistikat" msgid "Status" msgstr "Statusi" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Akoma hapur, nepermjet pyetesorit, %s" @@ -3621,7 +3744,12 @@ msgstr "Pamje e rrugës" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Nenkategoria: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Nenkategoria: %s" @@ -3638,18 +3766,19 @@ msgstr "Tema" msgid "Subject:" msgstr "Tema:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Dërgo" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3691,7 +3820,7 @@ msgstr "Përmbledhni problemin" msgid "Summarise your changes" msgstr "Përmbledhni ndryshimet tuaja" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3699,25 +3828,31 @@ msgstr "Përmbledhni ndryshimet tuaja" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Permbledhje" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Raportet përmbledhëse" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Raportet përmbledhëse" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "Superpërdorues:" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "Superpërdorues keni leje për të kryer të gjitha veprimet brenda adminit." -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Rezultatet e Studimit" @@ -3725,14 +3860,14 @@ msgstr "Rezultatet e Studimit" msgid "Template «%s»" msgstr "Shabllon «%s» " -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Shabllonet" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -3740,7 +3875,7 @@ msgstr "Tekst" msgid "Text only version" msgstr "Vetem versioni i me tekst" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3767,7 +3902,7 @@ msgstr "Faleminderit për kërkesën tuaj" msgid "Thank you for your feedback" msgstr "Faleminderit për komentin tuaj" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Faleminderit që ngarkuat fotografinë tuaj. Tani duhet të lokalizojmë problemin tuaj, andaj ju lutem të jepni emrin e rrugës apo kodit postar më të afërt në kutinë më lartë." @@ -3783,7 +3918,7 @@ msgstr "Duket se imazhi nuk është ngarkuar si duhet (%s), ju lutem provoni pë msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Ai vend nuk duket të jetë i mbuluar nga një drejtori; ndoshta kjo është në det të hapur ose jashtë vendit. Ju lutemi provoni përsëri." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Ai vend nuk duket të jetë në Kosovë; ju lutem provoni përsëri." @@ -3793,11 +3928,11 @@ msgstr "Ai vend nuk duket të jetë në Kosovë; ju lutem provoni përsëri." msgid "That postcode was not recognised, sorry." msgstr "Kodi postar nuk u njoh, na vjeqn keq." -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Ky problem ka qenë i shënuar si i dërguar." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Ai problem tash do të ri-dërgohet." @@ -3833,8 +3968,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3871,8 +4006,8 @@ msgstr "Drejtoria nuk do të jetë në gjendje të ndihmojë veç nëse ju lëni msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Gabimi ishte: %s" @@ -3914,7 +4049,7 @@ msgstr "Problemet e fundit te raportuara si te rregulluara nga perdoruesit" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Problemet e fundit brenda {{NAME}} kufirit të raportuara nga përdoruesit" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "Linku mund të ketë skaduar, ose ndoshta ju nuk mundet ta kopjoni atë të saktë." @@ -3939,7 +4074,7 @@ msgstr "URL e kerkuar '%s' nuk u gjet ne kete 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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 mund të lokalizojnë problemin në hartë, por ata mund të shohin zonën përreth lokacionit të cilin kanë dhënë" @@ -3952,33 +4087,38 @@ msgstr "" " Emri i përdoruesit është shfaqur publikisht në raportet që nuk janë shënuar si anonim .\n" "Emrat nuk janë domosdoshmërisht unike." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Nuk ka raporte për të shfaqur" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Ka problem në hapjën e faqes Të gjitha raportet. Ju lutem provoni përsëri më vonë." #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "Ka probleme në hapjën e kësaj faqe. Ju lutem provoni përsëri më vonë." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Ka një problem në kombinimin e email/fjalëkalimit tuaj. Nëse nuk mund të kujtoni fjalëkalimin tuaj, ose nuk keni një, ju lutem plotësoni &isquo, dhe nënshkruani me email&rqsuo, seksionin në formë." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Ka një problem me kombinimin e emailit/fjalëkalimit tuaj. Ju lutem provoni përsëri." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Ka një problem në kombinimin e email/fjalëkalimit tuaj. Nëse nuk mund të kujtoni fjalëkalimin tuaj, ose nuk keni një, ju lutem plotësoni &isquo, dhe nënshkruani me email&rqsuo, seksionin në formë." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Ka një problem me përditësimin tuaj. Ju lutem provoni përsëri." @@ -3986,7 +4126,7 @@ msgstr "Ka një problem me përditësimin tuaj. Ju lutem provoni përsëri." msgid "There were problems with your report. Please see below." msgstr "Ka disa probleme me raportin tuaj. Ju lutem shihni më poshtë." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Ka pasur probleme me përditësimin tuaj. Ju lutemi shihni më poshtë." @@ -4046,26 +4186,34 @@ msgstr "" "Kjo Drejtori do të pranojë vetëm raporte për probleme që janë të vendosura në zonën e mbuluar .\n" "Një drejtori nuk do të marrë ndonjë raport vetëm nëse ajo mbulon të paktën një zonë atëherë do të pranojë një raport." -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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 është dërguar të dy Drejtorite që mbulojnë vendndodhjen e problemit, pasi përdoruesi nuk e kategorizoj atë; ju lutemi të injoroni atë në qoftë se ju nuk jeni Drejtoria e duhur për t'u marrë me këtë çështje, ose na tregoni se çfarë kategorie e problemit është kjo kështu që ne mund të shtojmë atë në sistemin tonë." -#: perllib/FixMyStreet/Script/Reports.pm:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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 email është dërguar në disa Drejtori që mbulojnë vendndodhjen e problemit, pasi që kategoria e zgjedhur është dhënë për të gjithë ata; ju lutemi ta injoroni atë në qoftë se ju nuk jeni Drejtoria e duhur për t'u marrë me këtë çështje." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1017 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ky informacion është i nevojshëm" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Kjo është web faqe e zhvilluesve; gjëra mund të thyhen në çdo kohë, dhe baza e të dhënave do të fshihet në mënyrë periodike." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "Kjo gropë ka qenë këtu për dy muaj dhe ..." @@ -4082,7 +4230,7 @@ msgstr "Ky problem nuk ka qene i rregulluar" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4092,23 +4240,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Ky raport është në pritje moderim." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Ky raport eshte shenuar si i mbyllur." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Ky raport eshte shenuar si i rregulluar." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Ky problem eshte i shenuar si i hapur." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Ky raport është dorëzuar në mënyrë anonime" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Kjo web faqe përmban edhe një foto të problemit, e dhënë nga ana e përdoruesit." @@ -4119,7 +4267,7 @@ msgstr "Kjo web faqe përmban edhe një foto të problemit, e dhënë nga ana e msgid "Time spent (in minutes):" msgstr "Koha e kaluar(në minuta):" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Kohëzgjatja" @@ -4131,20 +4279,21 @@ msgstr "Këshilla për foto sa më të mira" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Titulli" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Titulli:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "Për të gjetur se çfarë njoftime lokale kemi për ju, ju lutem shkruani kodin postar %s ose emrin e rrugës dhe zonën:" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Për të gjetur se çfarë njoftime lokale kemi për ju, ju lutem shkruani kodin postar ose emrin e rrugës dhe zonën" @@ -4156,44 +4305,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "Për të parë një hartë të vendndodhjen e saktë të kësaj çështjeje" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Total" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Total" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "Menaxhimi i trafikut i nevojshëm?" @@ -4206,18 +4347,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "Të besuar nga Drejtoritë:" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "I besuar për të bërë raporte të cilat nuk duhet të kontrollhen" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "Të besuar:" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Provo përsëri" @@ -4232,7 +4374,11 @@ msgstr "Provoni për të na shkruar email direkt:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4241,15 +4387,11 @@ msgstr "" msgid "Unconfirmed" msgstr "E pakonfirmuar" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "Raportime të pa zgjidhura" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "E panjohur" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Lloj i njoftimit i panjohur" @@ -4259,13 +4401,14 @@ msgstr "Lloj i njoftimit i panjohur" msgid "Unknown error" msgstr "Gabim i panjohur" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "ID problemi i panjohur" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4290,12 +4433,12 @@ msgstr "Përditësimi më poshtë është shtuar anonimisht në %s" msgid "Update below added by %s at %s" msgstr "Përditësimi më poshtë është shtuar nga %s në %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Përditësime të nën-ndara në shtete" @@ -4303,16 +4446,16 @@ msgstr "Përditësime të nën-ndara në shtete" msgid "Update by {{name}}" msgstr "Perditesuar nga {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Perditesimi ka ndrruar gjendjen e problemit ne %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Perditesimi shenon problemin si te rregulluar" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Përditësoni problemin e ri-hapur." @@ -4326,20 +4469,20 @@ msgstr "" msgid "Updated" msgstr "Perditesuar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Postuar nga %s (%s) ne %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Postuar nga %s ne %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4347,7 +4490,7 @@ msgid "Updated!" msgstr "Perditesuar!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Perditesime" @@ -4394,40 +4537,81 @@ msgstr "Harta të përdorura" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Emaili u shtua te lista e abuzimeve" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Emaili tanimë është në listë e abuzuesve" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Flamuri i përdoruesit është hequr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "Ne tabelen e abuzimeve?" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Përdoruesi gjen përputhje në kërkimet e emrit të përdoruesit dhe email adresës." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Perdoruesit" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Perdoruesit" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "Përdoruesit mund të ndërmarrin hapat brenda drejtorisë apo fushës së tyre të dedikuar." -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Vlerat e perditesuara" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Email adresa e re " + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Numri juaj i telefonit" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4449,12 +4633,7 @@ msgstr "Duke parë lokacionin" msgid "Viewing a problem" msgstr "Duke parë problemin" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4464,20 +4643,25 @@ msgstr "" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Kemi gjetur më shumë se një përputhje për këtë lokacion. Ne shfaqim deri në dhjetë përputhje, ju lutem bëni kërkim tjetër nese nuk gjeni lokacionin tuaj" +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Ne kemi gjetur më shumë se një përputhje për referencën e problemit" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "Ne kemi gjetur më shumë se një përputhje për referencën e problemit" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "Na nevojitet email adresa juaj, ju lutemi shkruajeni më poshtë" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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 "Ne kuptojmë që ky problem mund të jetë përgjegjësi e pavarësisht ne nuk kemi ndonjë detaj kontaktues për ta. Por nese ju dini ndonjë kontakt adresë të përshtatshme, ju lutem kontaktoni." @@ -4485,6 +4669,12 @@ msgstr "Ne kuptojmë që ky problem mund të jetë përgjegjësi e pavarësisht msgid "We send it to the council on your behalf" msgstr "Ne e dërgojmë tek council në emrin tuaj" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Kemi gjetur më shumë se një përputhje për këtë lokacion. Ne shfaqim deri në dhjetë përputhje, ju lutem bëni kërkim tjetër nese nuk gjeni lokacionin tuaj" + #: 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." @@ -4494,8 +4684,8 @@ msgstr "Ne do të përdorim të dhënat tuaja personale në përputhje me rregul msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "Na vjen eq qe problemi nuk është rregulluar. Pse nuk provoni të ju shkruani përfaqësuesve tuaj lokal?" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4523,7 +4713,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4546,6 +4736,10 @@ msgstr "Dëshirë" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4562,16 +4756,7 @@ msgstr "Nëse shkruani mesazhin tuaj me shkronja të mëdha është e vështirë msgid "Wrong location? Just click again on the map." msgstr "Lokacion i gabuar? Vetëm klikoni përsëri në hartë." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Viti" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4586,7 +4771,7 @@ msgstr "Viti" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Po" @@ -4599,7 +4784,7 @@ msgstr "Po une kam nje fjalekalim" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4616,7 +4801,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "Ju mund te shihni problemin ne kete faqe." -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4642,7 +4827,7 @@ 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 "Ju mund të na ndihmoni duke gjetur një email kontaktues për problemet lokale dhe ta dërgoni atë tek ne." -#: templates/web/base/admin/body-form.html:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4650,7 +4835,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "Ju anuluat; ju lutem plotësoni kutinë më lartë " -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4677,18 +4862,38 @@ msgstr "Ju keni qene te shkyqur" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Ju keni lokalizuar problemin tuaj me një pin të gjelbër në hartë. Nëse ky nuk është lokacioni i saktë, thjeshtë klikoni në hartë përsëri." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Ju keni konfirmuar me sukses email adresën tuaj." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Ju keni konfirmuar me sukses email adresën tuaj." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Ju keni konfirmuar me sukses email adresën tuaj." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Ju keni konfirmuar me sukses email adresën tuaj." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Ju jeni kyçur me sukses, ju lutem konfirmoni dhe kontrolloni nëse të dhënat tuaja janë të sakta." -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Ju keni konfirmuar me sukses email adresën tuaj." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Ju nuk keni krijuar asnjë raport ende. Raportoni problemin tani" @@ -4712,36 +4917,43 @@ msgid "Your Reports" msgstr "Raportet tuaja" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "Llogaria juaj" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Email-i juaj" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Email adresa juaj" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Email adresa juaj" + #: 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 në përputhje me politikën tonë të privatsisë" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4752,19 +4964,19 @@ msgstr "Emri juaj" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4775,8 +4987,8 @@ msgstr "Fjalekalimi juaj" msgid "Your password has been changed" msgstr "Fjalekalimi juaj eshte ndryshuar" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Numri juaj i telefonit" @@ -4785,7 +4997,7 @@ msgstr "Numri juaj i telefonit" msgid "Your report" msgstr "Raporti juaj" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Raportet tuaja" @@ -4794,25 +5006,40 @@ msgstr "Raportet tuaja" msgid "Your shortlist" msgstr "Lista juaj e shkurtë" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Fjalekalimi juaj eshte ndryshuar" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Perditesimet tuaja" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "Vetëvetja" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "Të gjitha" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4829,8 +5056,8 @@ msgstr "" msgid "didn't use map" msgstr "nuk e perdorni harten" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "p.sh. ‘%s’ ose ‘%s’" @@ -4853,22 +5080,23 @@ msgstr "Perditesimi i fundit %s" msgid "less than a minute" msgstr "më pak se një minutë" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "asnjë" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "ose me gjeje ne menyre automatike" @@ -4909,7 +5137,7 @@ msgstr "" msgid "this location" msgstr "Duke parë lokacionin" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "ky lloj i problemit lokal" @@ -4917,11 +5145,11 @@ msgstr "ky lloj i problemit lokal" msgid "today" msgstr "sot" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4929,14 +5157,24 @@ msgstr "" msgid "used map" msgstr "harta e përdorur" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "Përdoruesi është nga council i njejtë si problemi" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "perdoruesi eshte shkaktar i problemit" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Emaili tanimë është në listë e abuzuesve" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Fshije nga lista e ngushtë" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4998,35 +5236,35 @@ msgid_plural "%d years" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" msgstr[1] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5096,6 +5334,42 @@ msgid_plural "reports" msgstr[0] "" msgstr[1] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(Email-i në tabelen abuzimi)" + +#~ msgid "By Date" +#~ msgstr "Nga Data" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Kliko ketu ose shkruaj si dd/mm/yyyy" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Raportet e konfirmuara ne mes te %s dhe %s" + +#~ msgid "Hide old" +#~ msgstr "Fshih të vjetrat" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Perfshire raportimet e pakonfirmuara" + +#~ msgid "Invalid end date" +#~ msgstr "Data e fundit jovalide" + +#~ msgid "Invalid start date" +#~ msgstr "Data e fillimit jovalide" + +#~ msgid "No council" +#~ msgstr "Ska council" + +#~ msgid "Show old" +#~ msgstr "Shfaq te vjetrat" + +#~ msgid "Unfixed reports" +#~ msgstr "Raportime të pa zgjidhura" + +#~ msgid "Year" +#~ msgstr "Viti" + #~ msgid "" #~ "%s sends different categories of problem\n" #~ "to the appropriate council, so problems within the boundary of a particular council\n" diff --git a/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po index 5b0c1f08b4d..bb32f564fa7 100644 --- a/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sr.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Serbian (https://www.transifex.com/mysociety/teams/12067/sr/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "i" @@ -32,6 +32,10 @@ msgstr "i" msgid " or " msgstr "ili" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d izmenio %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s kontakti skupštine – %s potvrđeni, %s nepotvrđeni" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -75,7 +79,7 @@ msgstr "" "problemima na određenoj udaljenosti od konkretne lokacije." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -89,6 +93,11 @@ msgstr "" msgid "%s live updates" msgstr "%s ažuriranja uživo" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s upitnici poslati – %s odgovoreni (%s%%)" @@ -97,7 +106,7 @@ msgstr "%s upitnici poslati – %s odgovoreni (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" "© \n" @@ -107,11 +116,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "(Defect & lokacija defekta)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Emejl u tabeli zloupotreba)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -147,7 +151,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(kao što su grafiti, slomljene ploče ili ulična rasveta)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -169,8 +173,8 @@ msgstr "(poslato oboma)" msgid "(we also have RSS feeds for problems within %s)" msgstr "RSS vesti %s, u okviru %s " -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Izaberi kategoriju --" @@ -183,14 +187,6 @@ msgstr "--Izaberi šablon--" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -199,17 +195,17 @@ msgid "" " Maybe add some MAPIT_TYPES to your config file?" msgstr "" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -218,33 +214,52 @@ msgstr "" msgid "%s live problems" msgstr " %s %s" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Ne Dozvolite mi da svoj izveštaj potvrdim e-mejlom" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Ne Dozvolite mi da svoj izveštaj potvrdim e-mejlom" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "ne Dozvolite da mi da ažuriranje potvrdim e-mejlom" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "ne Dozvolite da mi da ažuriranje potvrdim e-mejlom" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Ne dozvolite mi da se priključim e-mejlom" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Ne dozvolite mi da se priključim e-mejlom" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 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." -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Da Imam lozinku" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -261,11 +276,17 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Dodaj opštinu" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Blokiraj e-mejl adresu" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -288,11 +309,17 @@ msgstr "Dodaj novu kategoriju" msgid "Add option" msgstr "(opcionalno)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Bez broja telefona)" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "Dodaj u uži krug" @@ -302,23 +329,23 @@ msgstr "Dodaj u uži krug" msgid "Add user" msgstr "Dodaj korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "Dodaj/izmeni problemske kategorije" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "Dodaj/izmeni prioritete odgovora" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "Dodaj/izmeni šablone odgovora" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Dodato %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 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." @@ -342,9 +369,10 @@ msgstr "Obaveštenje %d deaktivirano (kreirano %s)" msgid "Alert me to future updates" msgstr "Upozori me na buduće ažurirane informacije" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -353,12 +381,13 @@ msgstr "" msgid "All Reports" msgstr "Sve prijave" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Sve prijave kao CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Sve kategorije" @@ -374,17 +403,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Sve prijave" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Sve prijave između %s i %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -422,7 +451,8 @@ 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:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Da li si siguran?" @@ -433,7 +463,7 @@ msgstr "Da li si siguran?" msgid "Area covered" msgstr "Pokriveno područje" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "Područje:" @@ -447,7 +477,7 @@ msgid "Assign to competent body:" msgstr "Dodeli nadležnoj direkciji:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Dodeli različitim kategorijama:" @@ -459,7 +489,7 @@ msgstr "Dodeli spoljnoj direkciji:" msgid "Assign to subdivision:" msgstr "Dodeli korisnicima po područjima:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "Dodeljeno %s" @@ -475,12 +505,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 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." -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Automatski odgovor:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "Automatski odgovor:" @@ -488,18 +523,10 @@ msgstr "Automatski odgovor:" msgid "Available categories" msgstr "Dostupne kategorije" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "Izbegavajte lične informacije i registarske tablice vozila " @@ -513,20 +540,21 @@ msgstr "Čekajući moderaciju" msgid "Back" msgstr "Nazad" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "Nazad na sve prijave" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Blokiraj e-mejl adresu" +#, fuzzy +msgid "Ban user" +msgstr "Obeleži korisnika " -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Direkcije" @@ -537,14 +565,10 @@ msgstr "Direkcije" msgid "Body" msgstr "Direkcija" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Direkcija" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Po datumu" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -557,8 +581,9 @@ 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:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Kategorije" @@ -569,30 +594,36 @@ msgstr "Kategorija" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategorija je promenjena sa ‘%s’ na ‘%s’" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategorija je promenjena sa ‘%s’ na ‘%s’" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Norma rešavanja problema stari > od 4 nedelje " -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -600,17 +631,18 @@ msgstr "Norma rešavanja problema stari > od 4 nedelje " msgid "Category:" msgstr "Kategorija:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategorija: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "Promeni e-mejl" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "Promeni e-mejl adresu" @@ -618,10 +650,16 @@ msgstr "Promeni e-mejl adresu" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Promeni lozinku" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Bez broja telefona)" + #: templates/web/base/admin/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." @@ -652,19 +690,14 @@ 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Klikni ovde ili unesi u formatu dd/mm/gggg" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klikni na mapu da prijaviš problem" @@ -693,18 +726,19 @@ msgstr "Klikni na link iz našeg e-mejla potvrde da se upišeš u sistem." #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Zatvoren" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Zaključila skupština" @@ -719,16 +753,17 @@ msgid "Cobrand" msgstr "" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -736,7 +771,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguracija" @@ -745,7 +780,7 @@ msgstr "Konfiguracija" msgid "Confirm" msgstr "Potvrdi" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Potvrdi račun" @@ -764,14 +799,10 @@ msgstr "Potvrda" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Potvrđeno" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Potvrđene prijave između %s i %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -798,8 +829,8 @@ msgstr "Kontaktiraj tim" msgid "Coordinates:" msgstr "Koordinate:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Korisnik se ne može naći" @@ -817,43 +848,16 @@ msgstr "Skupština" msgid "Council contacts for %s" msgstr "Kontakti skupštine za %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "skupštine ref: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Skupština:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Prebroji" @@ -875,40 +879,45 @@ msgstr "Kreiraj kategoriju" msgid "Create priority" msgstr "Kreiraj prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "Kreiraj izveštaje/najnovije informacije u ime korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "Kreiraj izveštaje/ažurirane informacije za skupštinu opštine" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "Kreiraj izveštaje/najnovije informacije u ime korisnika" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Kreiraj šablon" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Kreiran" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Kreiran:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Aktuelna situacija" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -919,14 +928,14 @@ msgstr "Trenutno nije kreirano nikakvo telo." msgid "Customer not contactable" msgstr "Klijent nedostupan" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Panel" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Rešiti na nivou pod-odseka u roku od 5 radnih dana" @@ -939,12 +948,12 @@ msgstr "" msgid "Default priority" msgstr "Kreiraj prioritet" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Izbriši šablon" @@ -955,8 +964,8 @@ msgstr "Izbriši šablon" msgid "Deleted" msgstr "Izbrisano" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -972,6 +981,10 @@ msgstr "Opis" msgid "Description:" msgstr "Opis:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -984,6 +997,10 @@ msgstr "Pojedinosti" msgid "Details:" msgstr "Pojedinosti:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Prebačeno" @@ -997,8 +1014,8 @@ msgstr "Nije koristio mapu" msgid "Diligency prize league table" msgstr "" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -1007,7 +1024,7 @@ 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" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1015,7 +1032,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:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1035,11 +1052,11 @@ msgstr "" 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:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1062,9 +1079,10 @@ msgstr "Kretanje ka istoku/severu:" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Izmeni" @@ -1074,33 +1092,33 @@ msgstr "Izmeni" msgid "Edit body details" msgstr "Izmeni podatke o opštini" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "Izmeni podatke drugih korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "Izmeni ovlašćenja drugih korisnika" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "Izmeni kategoriju prijave" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "Izmeni prioritet prijave" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "Izmeni prijave" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Izmeni problem %d" @@ -1121,7 +1139,6 @@ msgstr "Urednik" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1129,17 +1146,20 @@ msgstr "Urednik" msgid "Email" msgstr "Emejl" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Emejl dodat listi zloupotreba" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "Emejl adresa" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Emejl adresa" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Kreirano E-mejl obaveštenja" @@ -1148,19 +1168,18 @@ msgstr "Kreirano E-mejl obaveštenja" msgid "Email alert deleted" msgstr "Izbrisano E-mejl obaveštenje" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "E-mejl već na listi zloupotreba" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Emejl:\t" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Emejl: %s" @@ -1173,16 +1192,17 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Datum završetka:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1203,14 +1223,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Unesi naziv obližnje ulice i oblasti" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Unesi naziv obližnje ulice i oblasti" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Unesi lozinku" @@ -1228,8 +1248,8 @@ msgstr "Opiši problem" msgid "Error" msgstr "Greška" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Sve" @@ -1254,7 +1274,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "Objasni šta je pogrešno" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1270,7 +1290,7 @@ msgstr "Spoljni" msgid "External ID" msgstr "Spoljni ID" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "Spoljni URL" @@ -1282,7 +1302,7 @@ msgstr "Spoljno telo" msgid "External team" msgstr "Spoljni tim" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1294,7 +1314,7 @@ msgstr "Dodatni podaci" msgid "Extra data:" msgstr "Dodatni podaci:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "Dodatni podaci" @@ -1324,21 +1344,22 @@ msgstr "Uredite ovo izborom pokrivene oblasti u izmeni poda #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Sređeno" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Sređeno - Skupština" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Sređeno - Korisnik" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Obeleži kao izbrisano" @@ -1346,7 +1367,7 @@ msgstr "Obeleži kao izbrisano" msgid "Flag user" msgstr "Obeleži korisnika " -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Obeleženo" @@ -1355,7 +1376,7 @@ msgstr "Obeleženo" msgid "Flagged reports and users" msgstr "Obeležene prijave i korisnici" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Obeleženi korisnici navedeni na strani ." @@ -1363,8 +1384,8 @@ msgstr "Obeleženi korisnici navedeni na strani ." msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Obeleženo" @@ -1384,7 +1405,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "Za podrobnije informacije, vidi Kako Sredimoju ulicu koristi Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1404,8 +1425,12 @@ msgstr "Često postavljana pitanja" msgid "Frequently Asked Questions" msgstr "Preuzmite najnovije informacije" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1438,12 +1463,12 @@ msgstr "Drago mi je što čujem da je sređeno!" #: 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Nastavi" @@ -1451,7 +1476,7 @@ msgstr "Nastavi" msgid "Going to send questionnaire?" msgstr "Šaljete upitnik?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "Dozvolite pristup administratoru" @@ -1459,6 +1484,14 @@ msgstr "Dozvolite pristup administratoru" msgid "Graph of problem creation by status over time" msgstr "Grafikon kreiranja problema po statusu duž vremena" +#: templates/web/base/dashboard/index.html:93 +msgid "Group by %s" +msgstr "" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Da li je ovaj problem rešen?" @@ -1479,21 +1512,26 @@ msgstr "Pomoć" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "Pomozite nam %s da vaš problem rešimo brže, pružanjem dodatnih pojedinosti. Ove dodatne informacije neće biti objavljene online." +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Fotografije nedavnih obližnjih prijava" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Zdravo %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Sakriveno" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1514,21 +1552,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Sakrij stare" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Sakrij oznaku" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1540,7 +1575,7 @@ msgstr "" msgid "History" msgstr "Istorija" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Početak" @@ -1599,6 +1634,10 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1607,6 +1646,10 @@ 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 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." @@ -1615,7 +1658,7 @@ msgstr "If you get some more information about the status of your problem, pleas 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." -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "v" @@ -1624,7 +1667,7 @@ msgstr "v" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "Ukoliko ovde podnesete problem, problem neće biti prijavljen skupštini." -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1701,11 +1744,7 @@ msgstr "Inbox nula, stižemo!" msgid "Include reporter personal details" msgstr "Uključi lične podatke podnosioca prijave" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Uključi nepotvrđene prijave" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Netačno_photo value \"%s\"" @@ -1717,7 +1756,7 @@ msgstr "" msgid "Inspection required" msgstr "Potrebna inspekcija" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "Naložite ugovaračima da reše probleme" @@ -1729,26 +1768,18 @@ msgstr "Interna zabeleška" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Pogrešna agencija_odgovorna value %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Nevažeći datum završetka" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Nevažeći format %s naveden." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "Nevažeća lokacija. Novu lokaciju mora pokrivati ista skupština." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "Često je najbrže proveriti naša FAQ i videti da li se odgovor nalazi tamo." @@ -1767,7 +1798,7 @@ msgstr "Jurisdikcija nepoznata" msgid "Jurisdiction unknown" msgstr "Jurisdikcija nepoznata" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1792,12 +1823,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1823,18 +1849,14 @@ msgstr "Poslednje ažuriranje:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "Nedavno ažuriran" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1843,13 +1865,13 @@ msgstr "" msgid "List all reported problems" msgstr "Navedi sve prijavljene probleme" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Loading..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1881,12 +1903,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1894,11 +1919,11 @@ msgstr "" msgid "MAP" msgstr "MAPA" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "Upravljaj užim krugom" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1910,11 +1935,11 @@ msgstr "Mapa" msgid "Mark as sent" msgstr "Označi kao poslat" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 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:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1934,45 +1959,45 @@ msgstr "Poruka spoljnom telu:" msgid "Missing bodies:" msgstr "Direkcije koje nedostaju:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Jurisdikcija koja nedostaje_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "Uredi" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "Uredi pojedinosti o prijavi" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "Uredi ovu prijavu" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Uređuje odsek u jednom radnom danu " -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Mesec" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "Najčešće komentarisani" @@ -1990,9 +2015,9 @@ msgstr "Najčešće komentarisani" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2003,19 +2028,24 @@ msgstr "Ime" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Ime: %s" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Upravljaj ovim problemom" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "Upravljaj ovim problemom" +#: templates/web/base/report/_inspect.html:39 +#, fuzzy +msgid "Nearest calculated address:" +msgstr "Nova e-mejl adresa:" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2025,12 +2055,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2044,20 +2074,25 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "Pri kraju! Sada proverite vaš e-mejl…" +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "Pri kraju! Sada proverite vaš e-mejl…" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 #, fuzzy msgid "New" msgstr "Najnovije" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Dodata nova direkcija" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Dodata nova kontakt kategorija" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "Nova e-mejl adresa:" @@ -2078,6 +2113,11 @@ msgstr "Nova beleška za DM:" msgid "New password:" msgstr "Nova lozinka:" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Bez broja telefona)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2107,18 +2147,19 @@ msgstr "Novi problemi u okviru granice {{NAME}} na Sredimojuulicu" msgid "New reports" msgstr "Nove prijave" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Novo stanje" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Novi šablon" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "Najnovije" @@ -2126,7 +2167,7 @@ msgstr "Najnovije" msgid "Next" msgstr "Sledeće" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2138,22 +2179,18 @@ msgstr "Sledeće" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Ne" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Nema oblasti" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Nema direkcije" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Nema skupštine" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Nije odabrana skupština" @@ -2183,6 +2220,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "No result returned" @@ -2207,8 +2248,8 @@ msgstr "Nema pristalica" msgid "None" msgstr "Nijedan" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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." @@ -2216,8 +2257,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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2240,7 +2281,7 @@ msgstr "Nedostupan" msgid "Not for my subdivision" msgstr "Nije za moj pod-odsek" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Nije prijavljen ranije" @@ -2254,10 +2295,6 @@ msgstr "Nije prijavljen skupštini" msgid "Note" msgstr "Napomena" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2285,37 +2322,46 @@ msgstr "Now to submit your report…" msgid "Now to submit your update…" msgstr "Now to submit your update…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "U redu" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Staro stanje" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "Najstariji" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2354,23 +2400,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Drugi" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "Drugi" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2388,19 +2441,19 @@ msgstr "Strana nije nađena" msgid "Parent" msgstr "Izvor" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Delimično" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Lozinka (opcionalno)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Lozinka:" @@ -2408,7 +2461,7 @@ msgstr "Lozinka:" msgid "Permalink" msgstr "" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "Dozvole:" @@ -2417,19 +2470,25 @@ msgstr "Dozvole:" msgid "Phone Reporter:" msgstr "Prijavio:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Broj telefona" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Broj telefona (opcionalno)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Prijavio:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Tel:" @@ -2445,7 +2504,7 @@ msgstr "Tel:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2471,12 +2530,17 @@ msgstr "Fotografije" msgid "Photos of recent nearby reports" msgstr "Fotografije nedavnih obližnjih prijava" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Stavi oznaku na mapi" @@ -2498,25 +2562,34 @@ msgstr "Molimo vas budite ljubazni, koncizni i držite se suštine." msgid "Please check the passwords and try again" msgstr "Molimo vas proverite lozinke i probajte ponovo " -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 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:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Molimo vas proverite da li je vaša e-mejl adresa tačna " + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Molimo vas izaberite kategoriju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Molimo vas ispravite greške ispod" @@ -2531,39 +2604,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Molimo vas unesite poruku" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Molimo vas unesite vaš broj telefona" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "Molimo vas unesite ime" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "Molimo vas unesite naziv ovog tela" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Molimo vas unesite lozinku" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Molimo vas unesite predmet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Molimo vas unesite važeći e-mejl" @@ -2572,55 +2653,62 @@ msgstr "Molimo vas unesite važeći e-mejl" msgid "Please enter a valid email address" msgstr "Molimo vas unesite važeću e-mejl adresu" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Molimo vas unesite vaš broj telefona" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Molimo vas unesite neke podatke" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Molimo vas unesite vaš e-mejl" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Molimo vas unesite vašu e-mejl adresu" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Molimo vas unesite vaše ime" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Molimo vas unesite vaše ime" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Molimo vas unesite vaš broj telefona" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Molimo vas unesite vaše drugo ime" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Molimo vas unesite vaše zvanje" @@ -2669,7 +2757,12 @@ 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:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Molimo vas pružite javne informacije o ovoj prijavi." + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "Molimo vas pružite javne informacije o ovoj prijavi." @@ -2709,6 +2802,11 @@ msgstr "Molimo vas iznesite da li je problem rešen ili ne " msgid "Please upload an image only" msgstr "Molimo vas postavite samo sliku" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Molimo vas napišite poruku" @@ -2718,7 +2816,7 @@ msgid "Please write your update here" msgstr "Molimo vas napišite vaše najnovije informacije ovde" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Postavi" @@ -2727,15 +2825,15 @@ msgstr "Postavi" msgid "Posted anonymously at %s" msgstr "Postavljeno anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Postavio %s na %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Postavio %s (%s) na %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Postavio %s na %s" @@ -2747,11 +2845,11 @@ msgstr "Powered by N msgid "Previous" msgstr "Prethodni" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "Prioriteti" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "Prioritet" @@ -2768,7 +2866,7 @@ 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/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privatan" @@ -2792,21 +2890,21 @@ msgstr "Problem %s potvrđen" msgid "Problem %s sent to council %s" msgstr "Problem %s poslat skupštini %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Pregled problema po stanju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problem označen kao otvoren." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Promena stanja predmeta na osnovu rezultata ankete " -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problemi" @@ -2833,7 +2931,7 @@ msgstr "Nedavno prijavljeni problemi sređeni na Sredimojuulicu" msgid "Problems within %.1fkm of %s" msgstr "Problemi u okviru %.1fkm od ove lokacije" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2859,7 +2957,8 @@ msgstr "Problemi u okviru %s, %s" msgid "Property address:" msgstr "Adresa imovine:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Pruži najnovije informacije" @@ -2868,12 +2967,12 @@ msgstr "Pruži najnovije informacije" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Pružanje imena i lozinke je opcionalno, ali će isto dozvoliti da se lakše prijave problemi, daju najnovije informacije i u ravlja vašim prijavama." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Pružanje lozinke je opcionalno, ali će vam omogućiti da lakše prijavite probleme, da ostavite najnovije informacije i upravljate vašim prijavama." @@ -2886,12 +2985,12 @@ msgstr "" msgid "Public response:" msgstr "Javni odgovor:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "Javne informacije:" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Objavi fotografiju" @@ -2946,7 +3045,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2971,7 +3070,7 @@ msgstr "RSS vesti o najnovijim informacijama o ovom problemu" msgid "Receive email when updates are left on this problem." msgstr "Primi e-mejl kada su navedene najnovije informacije o ovom problemu." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "Primio %s par trenutaka kasnije" @@ -2985,7 +3084,7 @@ msgstr "Nedavni lokalni problemi, %s" msgid "Recently reported problems" msgstr "Nedavno prijavljeno problema" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "Nedavno ažurirano" @@ -3009,9 +3108,9 @@ msgstr "Ukloni oznaku" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "Ukloni iz užeg kruga" @@ -3019,12 +3118,16 @@ msgstr "Ukloni iz užeg kruga" msgid "Remove from site" msgstr "Ukloni sa internet stranice" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Ukloni sliku (ne može se vratiti korak unazad!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "Odgovori korisniku:" @@ -3053,11 +3156,11 @@ msgstr "Prijavi zloupotrebu" msgid "Report as" msgstr "Prijavi kao" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Prijavi u %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3072,17 +3175,17 @@ msgstr "Prijavi svoj problem" msgid "Report, view, or discuss local problems" msgstr "Prijavi, pregledaj ili diskutuj o lokalnim problemima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Prijavljeni anonimno u %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Prijavljeni ranije" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Prijavio %s u %s" @@ -3096,27 +3199,27 @@ msgstr "Prijavio:" msgid "Reported in the %s category" msgstr "Prijavljeno u kategoriji %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Prijavljeno u kategoriji %s anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Prijavljeno u kategoriji %s %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Prijavljeno putem %s anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Prijavljeno putem %s od strane %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Prijavljeno putem %s u kategoriji %s anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Prijavljeno putem %s u kategoriji %s od strane %s u %s" @@ -3125,8 +3228,8 @@ msgstr "Prijavljeno putem %s u kategoriji %s od strane %s u %s" msgid "Reported:" msgstr "Prijavio:" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3134,10 +3237,9 @@ msgstr "Prijavio:" msgid "Reporting a problem" msgstr "Prijavljivanje problema" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Prijave" @@ -3154,7 +3256,7 @@ msgstr "Prijave čekaju na odobrenje" msgid "Reports by destination" msgstr "Prijavio %s u %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 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." @@ -3166,7 +3268,7 @@ msgstr "" msgid "Reports published" msgstr "Objavljene prijave" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3222,21 +3324,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3255,17 +3358,17 @@ 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:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Okreni levo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Okreni desno" @@ -3275,21 +3378,21 @@ 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:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satelitski" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3300,12 +3403,12 @@ msgstr "Sačuvaj promene" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3324,7 +3427,7 @@ msgstr "Pretraži prijave" msgid "Search Users" msgstr "Pretraži korisnike" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Pretraži prijave" @@ -3335,6 +3438,7 @@ msgid "Search:" msgstr "Pretraga:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Pretraga bez rezultata." @@ -3347,7 +3451,7 @@ msgstr "Pretragom nađeno nula korisnika." msgid "See our privacy policy" msgstr "Vidi našu politiku privatnosti" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3356,8 +3460,8 @@ msgstr "" msgid "Select a body" msgstr "Odaberi telo" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Izaberi oblast" @@ -3377,11 +3481,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "Pošalji prijavu nazad" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Poslato %s %s kasnije" @@ -3390,11 +3499,11 @@ msgid "Sent:" msgstr "Poslato:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Usluga:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "Postavi na moju aktuelnu lokaciju" @@ -3403,9 +3512,9 @@ msgid "Share" msgstr "Podeli" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "Uži krug" @@ -3413,19 +3522,19 @@ msgstr "Uži krug" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "Ubačen u uži krug" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "Ubacio u uži krug %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3433,40 +3542,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Prikaži moje ime javno" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Prikaži stare" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Prikaži oznake" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3477,12 +3583,17 @@ msgstr "Upiši se" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Umesto toga, upiši se e-mejlom, unošenjem nove lozinke. Kada kliknete na link u vašem e-mejlu, ažuriraće se vaša lozinka." +#: templates/web/base/auth/general.html:96 +#, fuzzy +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "Umesto toga, upiši se e-mejlom, unošenjem nove lozinke. Kada kliknete na link u vašem e-mejlu, ažuriraće se vaša lozinka." + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Upiši se ili otvori račun" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Ispiši se" @@ -3500,7 +3611,7 @@ msgstr "" "Some endpoints require an API key to indicate that the reports are being\n" " sent from your FixMyStreet installation." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Neke fotografije nedavnih prijava" @@ -3513,15 +3624,20 @@ msgstr "Tekst koji treba pronaći" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "Izvinite, ovo nije’t važeći link" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "Izvinite, ovo nije’t važeći link" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3554,20 +3670,21 @@ 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:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "Sortiraj po" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 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:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "Osoblje:" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Datum početka:" #: templates/web/base/admin/body.html:73 @@ -3577,15 +3694,18 @@ msgstr "Datum početka:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Država" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Sačuvaj promene" @@ -3599,17 +3719,19 @@ msgstr "Sačuvaj promene" msgid "State:" msgstr "Statistike" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Država" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "" @@ -3619,7 +3741,7 @@ msgstr "" msgid "Status" msgstr "Status" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "I dalje otvoren, putem upitnika, %s" @@ -3632,7 +3754,12 @@ msgstr "Izgled ulice" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Pod-kategorija: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Pod-kategorija: %s" @@ -3649,18 +3776,19 @@ msgstr "Predmet" msgid "Subject:" msgstr "Predmet" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Podnesi" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3702,7 +3830,7 @@ msgstr "Rezimiraj problem" msgid "Summarise your changes" msgstr "Rezimiraj vaše promene" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3710,25 +3838,31 @@ msgstr "Rezimiraj vaše promene" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Rezime" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Kratki izveštaji" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Kratki izveštaji" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "Superkorisnik:" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "Superkorisnici imaju dozvolu da obave sve radnje u sklopu admin." -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Rezultati ankete" @@ -3736,14 +3870,14 @@ msgstr "Rezultati ankete" msgid "Template «%s»" msgstr "Šablon «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Šabloni" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Tekst" @@ -3751,7 +3885,7 @@ msgstr "Tekst" msgid "Text only version" msgstr "Samo tekstualna verzija" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3778,7 +3912,7 @@ msgstr "Hvala vam na upitu" msgid "Thank you for your feedback" msgstr "Hvala vam na vašim povratnim informacijama" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Hvala vam što ste postavili vašu fotografiju. Sada moramo da pronađemo vaš problem, tako da vas molimo da ubacite naziv ili poštanski broj obližnje ulice u rubriku gore  :" @@ -3794,7 +3928,7 @@ msgstr "Slika nije učitana ispravno (%s), molimo vas pokušajte ponovo." 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Po svemu sudeći data lokacija nije na Kosovu; molimo vas pokušajte ponovo." @@ -3804,11 +3938,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Dati problem obeležen je kao poslat." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Dati problem će sada biti ponovo poslat." @@ -3844,8 +3978,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3882,8 +4016,8 @@ msgstr "Direkcija neće’t biti u stanju da vam pomogne ukoliko ne ostavite msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Greška je: %s" @@ -3925,7 +4059,7 @@ msgstr "Poslednji problemi koje su korisnici prijavili kao rešene" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Poslednji problemi u sklopu granica {{NAME}} koje su korisnici prijavili" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 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." @@ -3950,7 +4084,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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 " @@ -3963,33 +4097,38 @@ msgstr "" "Nazivkorisnika javno se prikazuje na prijavama koje nisu označene kao anonimne.\n" "Nazivi nisu nužno jedinstveni." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Nema prijava za prikazivanje." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Nastao je problem sa vašom kombinacijom e-mejla/lozinke. Ukoliko ne možete da se setite svoje lozinke ili je nemate, molimo vas popunite ‘upišite se u odeljku na obrascu za email’." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Postoji problem sa kombinacijom vašeg e-mejla/lozinke. Molimo vas pokušajte ponovo." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Nastao je problem sa vašom kombinacijom e-mejla/lozinke. Ukoliko ne možete da se setite svoje lozinke ili je nemate, molimo vas popunite ‘upišite se u odeljku na obrascu za email’." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 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." @@ -3997,7 +4136,7 @@ msgstr "Bilo je problema sa vašim ažuriranjem. Molimo vas pokušajte ponovo." msgid "There were problems with your report. Please see below." msgstr "Ima problema sa vašom prijavom. Molimo vas vidite ispod." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Ima problema sa vašom prijavom. Molimo vas vidite ispod." @@ -4061,26 +4200,34 @@ 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:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ova informacija je tražena" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Ovo je veb stranica za programere; stvari se mogu pokvariti u svakom trenutku a baza podataka briše se periodično." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "Ova rupa je tu već dva meseca i…" @@ -4097,7 +4244,7 @@ msgstr "Ovaj problem nije sređen" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4107,23 +4254,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Ova prijava čeka na moderatora." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Ova prijava trenutno je označena kao zatvorena." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Ova prijava je trenutno označena kao sređena." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Ova prijava trenutno je obeležena kao otvorena." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Ova prijava podneta je anonimno" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4134,7 +4281,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Vremenski okvir" @@ -4146,20 +4293,21 @@ msgstr "Saveti za savršene fotografije" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Naslov" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Da saznate kakva lokalna obaveštenja imamo za vas, molimo vas unesite vaš %s poštanski broj ili ime ulice i oblast:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "Da saznate kakva lokalna obaveštenja imamo za vas, molimo vas unesite vaš poštanski broj ili ime ulice i oblast " -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "" @@ -4171,44 +4319,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "Da pogledate mapu sa preciznom lokacijom ovog pitanja" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Ukupno" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Ukupno" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "Potrebno upravljanje saobraćajem?" @@ -4221,18 +4361,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "Kojima veruju direkcije:" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 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:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "Verodostojan:" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Probajte ponovo" @@ -4247,7 +4388,11 @@ msgstr "Pokušajte da nam direktno pošaljete e-mejl:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4256,15 +4401,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Nepotvrđeno" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "Nerešene prijave" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Nepoznati" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Nepoznata vrsta obaveštenja" @@ -4274,13 +4415,14 @@ msgstr "Nepoznata vrsta obaveštenja" msgid "Unknown error" msgstr "Nepoznata greška" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4305,12 +4447,12 @@ msgstr "Najnovije informacije ispod dodate anonimno u %s" msgid "Update below added by %s at %s" msgstr "Najnovije informacije ispod dodao %s u %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Pregled najnovijih informacija po državi" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "" @@ -4318,16 +4460,16 @@ msgstr "" msgid "Update by {{name}}" msgstr "Ažurirao {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Ažurirane informacije promenile stanje problema na %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Ažuriranjem problem označen kao rešen" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Ažuriranjem ponovo otvoren problem" @@ -4341,20 +4483,20 @@ msgstr "" msgid "Updated" msgstr "Ažuriran" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Postavio %s (%s) na %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Postavio %s na %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4362,7 +4504,7 @@ msgid "Updated!" msgstr "Ažuriran!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Ažurirane informacije" @@ -4409,40 +4551,81 @@ msgstr "Upotrebljena mapa" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Emejl dodat listi zloupotreba" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "E-mejl već na listi zloupotreba" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Uklonjena oznaka korisnika" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "U tabeli zloupotreba?" #: templates/web/base/admin/users.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." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Korisnici" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Korisnici" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 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:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Ažurirane vrednosti" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Nova e-mejl adresa:" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "(Bez broja telefona)" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4464,12 +4647,7 @@ msgstr "Pregled lokacije" msgid "Viewing a problem" msgstr "Pregled problema" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4479,20 +4657,25 @@ msgstr "Pronašli smo više od jednog poklapanja za datu lokaciju. Prikazujemo d #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Pronašli smo više od jednog poklapanja za dati referentni broj problema:" +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Izvinite, nismo mogli da nađemo datu lokaciju." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 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:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4500,6 +4683,12 @@ msgstr "Shvatamo da je ovaj problem odgovornost %s; međutim, u ovom trenutku ne msgid "We send it to the council on your behalf" msgstr "Poslali smo ga skupštini u vaše ime" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Pronašli smo više od jednog poklapanja za dati referentni broj problema:" + #: 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." @@ -4509,8 +4698,8 @@ msgstr "Upotrebićemo samo vaše lične podatke u skladu sa našom MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4577,16 +4770,7 @@ msgstr "Ukoliko napišete vašu poruku u potpunosti velikim slovima teško je pr msgid "Wrong location? Just click again on the map." msgstr "Pogrešna lokacija? Samo kliknite ponovo na mapu." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Godina" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4601,7 +4785,7 @@ msgstr "Godina" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Da" @@ -4614,7 +4798,7 @@ msgstr "" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4631,7 +4815,7 @@ msgstr "" msgid "You can view the problem on this site." msgstr "" -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -4657,7 +4841,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4665,7 +4849,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4692,18 +4876,38 @@ msgstr "" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "" -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Molimo vas unesite vaš broj telefona" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Molimo vas unesite vaš broj telefona" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Molimo vas unesite vaš broj telefona" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Molimo vas unesite vaš broj telefona" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "" @@ -4727,36 +4931,42 @@ msgid "Your Reports" msgstr "" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +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 "" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4767,19 +4977,19 @@ msgstr "" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4790,8 +5000,8 @@ msgstr "" msgid "Your password has been changed" msgstr "" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "" @@ -4800,7 +5010,7 @@ msgstr "" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "" @@ -4809,25 +5019,39 @@ msgstr "" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +msgid "Your token has been generated" +msgstr "" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4844,8 +5068,8 @@ msgstr "" msgid "didn't use map" msgstr "" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "" @@ -4868,22 +5092,23 @@ msgstr "" msgid "less than a minute" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" msgstr "" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "" @@ -4924,7 +5149,7 @@ msgstr "" msgid "this location" msgstr "Pregled lokacije" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "" @@ -4932,11 +5157,11 @@ msgstr "" msgid "today" msgstr "" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4944,14 +5169,24 @@ msgstr "" msgid "used map" msgstr "" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "E-mejl već na listi zloupotreba" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Ukloni iz užeg kruga" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5021,7 +5256,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -5029,7 +5264,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" @@ -5037,7 +5272,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" @@ -5045,7 +5280,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -5053,7 +5288,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5133,6 +5368,42 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(Emejl u tabeli zloupotreba)" + +#~ msgid "By Date" +#~ msgstr "Po datumu" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Klikni ovde ili unesi u formatu dd/mm/gggg" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Potvrđene prijave između %s i %s" + +#~ msgid "Hide old" +#~ msgstr "Sakrij stare" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Uključi nepotvrđene prijave" + +#~ msgid "Invalid end date" +#~ msgstr "Nevažeći datum završetka" + +#~ msgid "No council" +#~ msgstr "Nema skupštine" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" + +#~ msgid "Show old" +#~ msgstr "Prikaži stare" + +#~ msgid "Unfixed reports" +#~ msgstr "Nerešene prijave" + +#~ msgid "Year" +#~ msgstr "Godina" + #~ msgid "" #~ "%s sends different categories of problem\n" #~ "to the appropriate council, so problems within the boundary of a particular council\n" diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index 2b4a311e222..3d0c469b1d5 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Jon Kristensen , 2017\n" "Language-Team: Swedish (Sweden) (https://www.transifex.com/mysociety/teams/12067/sv_SE/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr " och " @@ -32,6 +32,10 @@ msgstr " och " msgid " or " msgstr " eller " +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d ändringar av %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s kommuner kontaktade – %s bekräftade, %s obekräftade" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "%s har ett flertal RSS-flöden och epostbevakningar för lokala problem, inklusive bevakning för alla problem inom en kommun eller alla problem inom ett visst avstånd från en plats." #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "%s har ett flertal RSS-flöden och epostbevakningar för lokala problem, msgid "%s live updates" msgstr "%s uppdateringar" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s frågeformulär skickade – %s besvarade (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s frågeformulär skickade – %s besvarade (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© OpenStreetMap contributors" @@ -99,11 +108,6 @@ msgstr "© OpenStreetMap< msgid "(Defect & location of defect)" msgstr "(Defekt & defektens plats)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(Epost i missbrukstabellen)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -116,16 +120,15 @@ msgstr "(Inget telefonnummer)" #: templates/web/base/admin/states/index.html:95 msgid "(a-z and space only)" -msgstr "" +msgstr "(endast a-z och mellanslag)" #: templates/web/zurich/report/_item.html:19 msgid "(closed)" msgstr "(stängd)" #: templates/web/base/alert/_list.html:30 -#, fuzzy msgid "(covers roughly 200,000 people)" -msgstr "(ett avstånd som täcker ungefär 200,000 invånare)" +msgstr "(täcker ungefär 200 000 invånare)" #: templates/web/zurich/report/_item.html:17 msgid "(fixed)" @@ -133,13 +136,13 @@ msgstr "(fixad)" #: templates/web/base/admin/extra-metadata-form.html:53 msgid "(ignored if type is \"String\")" -msgstr "" +msgstr "(ignorerad om typen är \"Sträng\")" #: templates/web/base/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(ex.v. graffiti, skräp, trasiga gatustenar eller belysning)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "(finns inte längre)" @@ -157,12 +160,11 @@ msgstr "(skickat till båda)" #. ("%s is a list of distance links, e.g. [2km] / [5km] / [10km] / [20km]") #: templates/web/base/alert/_list.html:36 -#, fuzzy msgid "(we also have RSS feeds for problems within %s)" -msgstr "RSS-flöde för problem inom %s" +msgstr "(vi har också RSS-flöden för problem inom %s)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Välj en katagori --" @@ -175,14 +177,6 @@ msgstr "--Välj en mall--" msgid "10 inch pothole on Example St, near post box" msgstr "Hål i gatan på Storgatan, nära brevlådan" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "14-30 dagar gamla" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "7-14 dagar gamla" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -194,17 +188,16 @@ msgstr "" " Detta är förmodligen anledningen till att \"område som täcks (area covered)\" är tomt nedan.
\n" " Vill du lägga till några MAPIT_TYPES i konfigruationsfilen?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 -#, fuzzy +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" -msgstr " %s %s" +msgstr " %s rapporter %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "%s sparad." @@ -213,33 +206,52 @@ msgstr "%s sparad." msgid "%s live problems" msgstr "%s aktuella problem" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Nej Låt mig bekräfta min rapport via epost" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Nej Låt mig bekräfta min rapport via epost" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Nej Låt mig bekräfta uppdateringen via epost" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Nej Låt mig bekräfta uppdateringen via epost" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Nej Låt mig logga in med min epostadress" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Nej Låt mig logga in med min epostadress" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 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." -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Ja, jag har ett lösenord" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -253,22 +265,28 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Lägg till förvaltning" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Förbjud epostadress" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" -msgstr "" +msgstr "Lägg till ytterligare fält" #: templates/web/base/admin/extra-metadata-form.html:79 msgid "Add field" -msgstr "" +msgstr "Lägg till fält" #: templates/web/base/admin/states/index.html:85 msgid "Add fixed state" -msgstr "" +msgstr "Lägg till löst tillstånd" #: templates/web/base/admin/body.html:126 #: templates/web/zurich/admin/body.html:31 @@ -276,15 +294,20 @@ msgid "Add new category" msgstr "Ny kategori" #: templates/web/base/admin/extra-metadata-form.html:72 -#, fuzzy msgid "Add option" -msgstr "valfria" +msgstr "Lägg till alternativ" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Inget telefonnummer)" #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "Lägg till i slutlista" @@ -294,23 +317,23 @@ msgstr "Lägg till i slutlista" msgid "Add user" msgstr "Lägg till användare" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "Lägg till eller ta bort problemkategorier" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "Lägg till eller ta bort svarsprioriteringar" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "Lägg till eller ta bort svarsmallar" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Lades till %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 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." @@ -334,9 +357,10 @@ msgstr "Bevakning %d avaktiverad (skapad %s)" msgid "Alert me to future updates" msgstr "Varsko mig om framtida uppdateringar" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "Alla" @@ -345,38 +369,38 @@ msgstr "Alla" msgid "All Reports" msgstr "Alla rapporter" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Alla rapporter som CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Samtliga kategorier" #: templates/web/base/admin/reportextrafields/edit.html:26 -#, fuzzy msgid "All cobrands" -msgstr "Cobrand" +msgstr "Alla FixMyStreet-varianter" #: templates/web/base/admin/reportextrafields/edit.html:47 msgid "All languages" -msgstr "" +msgstr "Alla språk" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Alla rapporter" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Alla rapporter mellan %s och %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "All tid" @@ -395,9 +419,8 @@ msgstr "Anonym" #: templates/web/base/report/new/form_user_loggedin.html:21 #: templates/web/base/report/update/form_name.html:17 -#, fuzzy msgid "Anonymous user" -msgstr "Anonym" +msgstr "Anonym användare" #: templates/web/base/admin/report_edit.html:122 #: templates/web/base/admin/update_edit.html:23 @@ -414,7 +437,8 @@ 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:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Är du säker?" @@ -425,7 +449,7 @@ msgstr "Är du säker?" msgid "Area covered" msgstr "Område som täcks" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "Område:" @@ -439,7 +463,7 @@ msgid "Assign to competent body:" msgstr "Tilldela behörig förvaltning:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Lägg i en annan kategori:" @@ -451,7 +475,7 @@ msgstr "Tilldela extern förvaltning:" msgid "Assign to subdivision:" msgstr "Tilldela underavdelning:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "Tilldela användare till områden" @@ -467,12 +491,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 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." -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Autosvar:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "Autosvar:" @@ -480,18 +509,10 @@ msgstr "Autosvar:" msgid "Available categories" msgstr "Tillgängliga kategorier" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "Genomsnittlig tid från det att ett problem rapporteras till dess att det är löst, för de senaste 100 rapporterna." -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "Genomsnittlig tid för kommun att markera som löst (dagar)" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "Genomsnittlig tid för kommun till första rapportstatusändring (dagar)" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "Undvik personlig information och nummerplåtar" @@ -505,20 +526,21 @@ msgstr "Väntar på att granskas" msgid "Back" msgstr "Tillbaka" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "Tillbaka till samtliga rapporter" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Förbjud epostadress" +#, fuzzy +msgid "Ban user" +msgstr "Flagga användare" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Förvaltningar" @@ -529,17 +551,13 @@ msgstr "Förvaltningar" msgid "Body" msgstr "Förvaltning" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Förvaltning:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Efter datum" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" -msgstr "" +msgstr "Kan användas för att visa ytterligare text till användaren vid sidan om fältet. Standardmallen visar inte detta (meta.datatype_description), du måste lägga till det i category_extras_fields.html" #: templates/web/base/auth/token.html:27 templates/web/base/email_sent.html:20 msgid "Can’t find our email? Check your spam folder – that’s the solution 99% of the time." @@ -549,8 +567,9 @@ 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:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Kategorier" @@ -561,30 +580,36 @@ msgstr "Kategorier:" #: 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategori" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Kategori ändrat från ‘%s’ till ‘%s’" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -592,17 +617,18 @@ msgstr "Kategorins lösningsnivå för problem över 4 veckor gamla" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategori: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "Ändra e-postadress" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "Ändra e-postadress" @@ -610,10 +636,16 @@ msgstr "Ändra e-postadress" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Ändra lösenord" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Inget telefonnummer)" + #: templates/web/base/admin/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." @@ -635,19 +667,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "Välj en annan" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "Rensa offline-data" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Klicka här eller ange som dd/mm/yyyy" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Klicka på kartan för att rapportera ett problem" @@ -669,25 +696,25 @@ msgid "Click the link in our confirmation email to sign in." msgstr "Klicka på länken i vårt bekräftelsemail för att logga in." #: templates/web/base/auth/token.html:20 -#, fuzzy msgid "Click the link in that email to sign in." -msgstr "Klicka på länken i vårt bekräftelsemail för att logga in." +msgstr "Klicka på länken i det mejlet för att logga in." #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Stängd" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Stängd av kommunen" @@ -702,24 +729,25 @@ msgid "Cobrand" msgstr "Cobrand" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Cobrand data:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" -msgstr "" +msgstr "Kod" #: templates/web/base/js/translation_strings.html:50 msgid "Collapse map" msgstr "Vik ihop karta" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" @@ -728,7 +756,7 @@ msgstr "Konfiguration" msgid "Confirm" msgstr "Bekfräfta" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Bekräfta konto" @@ -747,14 +775,10 @@ msgstr "Bekräftelse" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Bekräftat" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Bekräftade rapporter mellan %s och %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -781,8 +805,8 @@ msgstr "Kontakta teamet" msgid "Coordinates:" msgstr "Koordinater:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Kan inte hitta användaren" @@ -800,50 +824,22 @@ msgstr "Kommun" msgid "Council contacts for %s" msgstr "Kommunkontakter för %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "Kommun har markerat som stängd" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "Kommun har markerat som löst" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "Kommun har markerat som pågående" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "Kommun har markerat som under utredning" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "Kommun har markerat som planerad" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "kommunens referens: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Kommun:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Antal" #: templates/web/base/admin/states/index.html:114 -#, fuzzy msgid "Create" -msgstr "Skapad" +msgstr "Skapa" #: templates/web/base/email_sent.html:1 msgid "Create a report" @@ -858,40 +854,44 @@ msgstr "Skapa en kategori" msgid "Create priority" msgstr "Skapa prioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 -#, fuzzy +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" -msgstr "Skapa rapporter/uppdateringar på en användares vägnar" +msgstr "Skapa rapporter/uppdateringar som anonym användare" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "Skapa rapporter/uppdateringar som kommunen" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "Skapa rapporter/uppdateringar på en användares vägnar" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Välj mall" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Skapad" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Skapad:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Nuvarande status" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -902,32 +902,31 @@ msgstr "Inga förvaltningar har skapats ännu." msgid "Customer not contactable" msgstr "Kund ej kontaktbar" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" -msgstr "Skrivbord" +msgstr "Översikt" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Hanterat av underavdelning inom 5 arbetsdagar" #: templates/web/base/admin/responsepriorities/list.html:9 msgid "Default" -msgstr "" +msgstr "Standard" #: templates/web/base/admin/responsepriorities/edit.html:39 -#, fuzzy msgid "Default priority" -msgstr "Skapa prioritet" +msgstr "Standardprioritet" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "Defekttyp" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Ta bort mall" @@ -938,8 +937,8 @@ msgstr "Ta bort mall" msgid "Deleted" msgstr "Borttagen" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "Beskriv varför du modererar detta" @@ -955,6 +954,10 @@ msgstr "Beskrivning" msgid "Description:" msgstr "Beskrivning:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -967,6 +970,10 @@ msgstr "Detaljer" msgid "Details:" msgstr "Detaljer:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Delegerat" @@ -980,8 +987,8 @@ msgstr "Använde inte kartan" msgid "Diligency prize league table" msgstr "Flitighetstopplistan" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "Ta bort ändringar" @@ -990,7 +997,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Skicka inte e-postnotifikationer kring hämtade kommentarer till problemrapportens skapare" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -998,7 +1005,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:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "Vill du automatiskt lyfta en defekt?" @@ -1018,11 +1025,11 @@ msgstr "Ner en" 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:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "Dublett av" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "Dubletter" @@ -1042,9 +1049,10 @@ msgstr "Easting/Northing:" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Ändra" @@ -1054,33 +1062,33 @@ msgstr "Ändra" msgid "Edit body details" msgstr "Ändra förvaltningsdetaljer" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "Redigera andra användares uppgifter" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "Redigera andra användares rättigheter" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "Redigera rapportkategori" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "Redigera rapportprioritet" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "Redigera rapporter" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Ändrar problem %d" @@ -1101,7 +1109,6 @@ msgstr "Redaktör" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1109,17 +1116,20 @@ msgstr "Redaktör" msgid "Email" msgstr "Epost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Epostadressen tillagd till missbrukslistan" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "E-postadress" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "E-postadress" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "E-postnotifikation skapad" @@ -1128,19 +1138,18 @@ msgstr "E-postnotifikation skapad" msgid "Email alert deleted" msgstr "E-postnotifikation borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Epostadressen finns redan i missbrukslistan" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Epost:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "E-post: %s" @@ -1156,16 +1165,17 @@ 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/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Slutdatum:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1186,14 +1196,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Ange ett postnummer eller gatunamn och ort" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Ange ett närligande gatunamn och ort" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Ange ett lösenord" @@ -1211,8 +1221,8 @@ msgstr "Skriv in information om problemet" msgid "Error" msgstr "Fel" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Allt" @@ -1237,7 +1247,7 @@ msgstr "Expandera karta" msgid "Explain what’s wrong" msgstr "Förklara felet" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "Exportera som CSV" @@ -1253,7 +1263,7 @@ msgstr "Extern" msgid "External ID" msgstr "Externt ID" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "Extern URL" @@ -1265,19 +1275,18 @@ msgstr "Extern förvaltning" msgid "External team" msgstr "Externt arbetslag" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 -#, fuzzy msgid "Extra Fields" -msgstr "Extra uppgifter" +msgstr "Ytterligare fält" #: templates/web/base/admin/contact-form.html:141 #: templates/web/base/admin/report_edit.html:94 msgid "Extra data:" msgstr "Extra data:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "Extra uppgifter" @@ -1289,7 +1298,7 @@ msgstr "Misslyckades med att skicka meddelande" #: templates/web/base/admin/reportextrafields/edit.html:58 #: templates/web/base/admin/reportextrafields/index.html:9 msgid "Fields" -msgstr "" +msgstr "Fält" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1307,21 +1316,22 @@ msgstr "Lös detta genom att välja ett lämpligt område i flagged page." msgstr "Flaggade användare är listade på flaggningssidan." @@ -1346,8 +1356,8 @@ msgstr "Flaggade användare är listade på flaggningssidan." msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Flaggat:" @@ -1361,13 +1371,13 @@ msgstr "Inkludera en närbild och en vidbild för bästa resultat" #: templates/web/base/admin/extra-metadata-form.html:52 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 "" +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 msgid "For more information, see How FixMyStreet uses Mapit." msgstr "För mer information, se How FixMyStreet uses Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1387,9 +1397,13 @@ msgstr "Vidarebefordrade önskan till extern förvaltning" msgid "Frequently Asked Questions" msgstr "Vanliga frågor" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" -msgstr "Hämta Antal" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" +msgstr "" #: templates/web/base/around/_updates.html:3 #: templates/web/base/report/display_tools.html:14 @@ -1412,7 +1426,7 @@ msgstr "Ge mig ett RSS-flöde" #: templates/web/base/admin/reportextrafields/edit.html:6 msgid "Give this collection of fields a name. It is not shown publicly, just here in the admin." -msgstr "" +msgstr "Ge den här fältgruppen ett namn. Det visas inte offentligt, utan bara här i administrationskontrollpanelen." #: templates/web/base/questionnaire/completed.html:14 msgid "Glad to hear it’s been fixed!" @@ -1421,12 +1435,12 @@ msgstr "Vi är glada att höra att det har blivit löst!" #: 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Gå" @@ -1434,7 +1448,7 @@ msgstr "Gå" msgid "Going to send questionnaire?" msgstr "Skicka enkät?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "Bevilja tillgång till administratörskontrollpanelen" @@ -1442,6 +1456,15 @@ 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/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "av %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Har det här problemet blivit löst?" @@ -1462,21 +1485,26 @@ msgstr "Hjälp" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "Hjälp %s lösa ditt problem snabbare genom att tillhandahålla lite extra uppgifter. Den här informationen kommer inte att visas offentligt på sajten." +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Foton från närliggande rapporter" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hej %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Gömd" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "Dölj hela rapporten" @@ -1497,33 +1525,30 @@ 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:67 -msgid "Hide old" -msgstr "Göm äldre" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Göm kartnålar" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "Dölj uppdatering helt?" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "Dölj ditt namn?" #: templates/web/base/admin/extra-metadata-form.html:38 msgid "Hint" -msgstr "" +msgstr "Tips" #: templates/web/base/admin/category_edit.html:24 msgid "History" msgstr "Historik" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Hem" @@ -1570,7 +1595,7 @@ msgstr "Identifiera en förälder om den här förvaltningen ä #: templates/web/base/auth/token.html:19 msgid "If there's a user associated with the address you entered, we've sent a confirmation email." -msgstr "" +msgstr "Om en användare är associerad med adressen som du skrev in, så har vi skickat ett bekräftelsemejl." #: templates/web/base/admin/responsepriorities/edit.html:23 msgid "If this priority is passed to an external service (e.g. Exor/Confirm) enter the priority code to use with that service here." @@ -1578,6 +1603,10 @@ msgstr "Om denna prioritet skickas vidare till en extern tjänst (t.ex. Exor/Con #: templates/web/base/admin/extra-metadata-form.html:24 msgid "If ticked the user won’t see an input field, just the ‘Description’ text." +msgstr "Om ikryssad så kommer användaren inte att se ett textfält, utan endast beskrivningstexten." + +#: templates/web/base/admin/template_edit.html:59 +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 @@ -1586,6 +1615,10 @@ msgid "" " 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 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." @@ -1594,7 +1627,7 @@ msgstr "Om du får mer information om problemets status får du gärna komma til 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." -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template 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 mallen skall vara valbar för specifika kategorier, välj då dessa här. Som standard visas den för samtliga kategorier." @@ -1603,7 +1636,7 @@ msgstr "Om du bara vill att den här mallen skall vara valbar för specifika kat msgid "If you submit a problem here the problem will not be reported to the council." msgstr "Om du skapar en problemrapport här så kommer rapporten inte att skickas till kommunen." -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "Om du vill använda denna mall för att automatiskt fylla i uppdateringsfältet då en rapports status ändras, välj då statusvärdet här." @@ -1675,11 +1708,7 @@ msgstr "Inbox zero, här kommer vi!" msgid "Include reporter personal details" msgstr "Inkludera rapportörens personuppgifter" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Inkludera obekräftade rapporter" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Inkorrekt värde för has_photo, \"%s\"" @@ -1691,7 +1720,7 @@ msgstr "Inspektera rapport" msgid "Inspection required" msgstr "Inspektion krävs" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "Instruera entreprenörer att lösa problem" @@ -1703,26 +1732,18 @@ msgstr "Interna anteckningar" msgid "Internet glitch" msgstr "Internet-problem" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Inkorrekt värde för agency_responsible, \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Inkorrekt slutdatum" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Inkorrekt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 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." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Inkorrekt startdatum" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "Det går oftast snabbast att kolla vår FAQ och se om svaret finns där." @@ -1741,37 +1762,32 @@ msgstr "Jurisdiktion Okänd" msgid "Jurisdiction unknown" msgstr "Jurisdiktion okänd" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" -msgstr "Behåll mig inloggad på den här datorn" +msgstr "Behåll mig inloggad på den här enheten" #: templates/web/base/admin/extra-metadata-form.html:61 msgid "Key" -msgstr "" +msgstr "Nyckel" #: templates/web/base/admin/states/index.html:9 #: templates/web/base/admin/states/index.html:95 msgid "Label" -msgstr "" +msgstr "Etikett" #: templates/web/base/admin/_translations.html:6 #: templates/web/base/admin/reportextrafields/edit.html:45 msgid "Language" -msgstr "" +msgstr "Språk" #: templates/web/base/admin/reportextrafields/index.html:8 msgid "Languages" -msgstr "" - -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "De senaste fyra veckorna" +msgstr "Språk" -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "De senaste sju dagarna" @@ -1797,33 +1813,29 @@ msgstr "Senaste uppdatering:" msgid "Latitude/Longitude:" msgstr "Latitud/Longitud:" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "Tidigast uppdaterad" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "Mindre än sju dagar gammal" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" -msgstr "" +msgstr "Lista" #: templates/web/base/admin/body.html:31 msgid "List all reported problems" msgstr "Lista alla rapporterade problem" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Laddar..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1855,12 +1867,16 @@ msgstr "Logga in med Facebook" msgid "Log in with Twitter" msgstr "Logga in med Twitter" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "Logga in med e-post" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +#, fuzzy +msgid "Log in with email/text" +msgstr "Logga in med e-post" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "Slå upp" @@ -1868,11 +1884,11 @@ msgstr "Slå upp" msgid "MAP" msgstr "KARTA" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "Hantera slutlista" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "Manuell ordning" @@ -1884,11 +1900,11 @@ msgstr "Karta" msgid "Mark as sent" msgstr "Markera som skickad" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 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:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "Lägg till problemdetaljer" @@ -1908,45 +1924,45 @@ msgstr "Meddelande till extern förvaltning:" msgid "Missing bodies:" msgstr "Saknade förvaltningar:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Saknat jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "Moderera" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "Moderera rapportdetaljer" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "Moderera den här rapporten" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "Moderera den här uppdateringen" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "Modererad av %s %s" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Granskat av underavdelningen inom en arbetsdag" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "Anledning till moderering:" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Månad" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "Mest kommenterad" @@ -1964,9 +1980,9 @@ msgstr "Mest kommenterad" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1977,19 +1993,24 @@ msgstr "Namn" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Namn:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Namn: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "Navigera till det här problemet" +#: templates/web/base/report/_inspect.html:39 +#, fuzzy +msgid "Nearest calculated address:" +msgstr "Ny e-postadress:" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1999,12 +2020,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 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" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2014,26 +2035,30 @@ msgstr "" #: templates/web/base/auth/token.html:18 msgid "Nearly done!" -msgstr "" +msgstr "Nästan klart!" #: templates/web/base/auth/token.html:22 templates/web/base/email_sent.html:5 msgid "Nearly done! Now check your email…" msgstr "Nästan klart! Kolla nu din epost." -#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 +#: templates/web/base/auth/smsform.html:19 #, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "Nästan klart! Kolla nu din epost." + +#: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" -msgstr "Senaste" +msgstr "Ny" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Ny förvaltning tillagd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Nya kategorikontakter tillagda" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "Ny e-postadress:" @@ -2054,6 +2079,11 @@ msgstr "Ny anteckning till DM:" msgid "New password:" msgstr "Nytt lösenord:" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Inget telefonnummer)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2083,18 +2113,19 @@ msgstr "Nya problem inom {{NAME}}'s administrativa gräns på FixaMinGata" msgid "New reports" msgstr "Nya rapporter" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Ny status" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Ny mall" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "Senaste" @@ -2102,7 +2133,7 @@ msgstr "Senaste" msgid "Next" msgstr "Nästa" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2114,22 +2145,18 @@ msgstr "Nästa" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Nej" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "Inget område" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Ingen förvaltning" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Ingen kommun" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Ingen kommun vald" @@ -2159,6 +2186,10 @@ msgstr "Inga inspektioner av den inspektören i det valda datumintervallet." msgid "No inspections in the selected date range." msgstr "Inga inspektioner i det valda datumintervallet." +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Inget resultat returnerades" @@ -2181,8 +2212,8 @@ msgstr "Inga supporters" msgid "None" msgstr "Inget" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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." @@ -2190,8 +2221,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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2210,7 +2241,7 @@ msgstr "Ej kontaktbar" msgid "Not for my subdivision" msgstr "Inte för min underavdelning" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Ej rapporterat tidigare" @@ -2224,10 +2255,6 @@ msgstr "Ej rapporterat till kommunen" msgid "Note" msgstr "Observera" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Observera att när vi listar obegräftade rapporter använder vi datumet när rapporten skapades, vilket inte nödvändigtvis är samma månad som när rapporten bekräftades, så vissa avvikelser kan uppstå." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2243,7 +2270,7 @@ msgstr "Anteckningar från SDM till DM" #: templates/web/base/admin/extra-metadata-form.html:26 msgid "Notice" -msgstr "" +msgstr "Notis" #: templates/web/base/report/new/oauth_email_form.html:17 msgid "Now to submit your report…" @@ -2255,37 +2282,47 @@ msgstr "För att skicka din rapport…" msgid "Now to submit your update…" msgstr "För att skicka din uppdatering…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "Antalet problem rapporterade för varje kategori, under de senaste sju dagarna." +#: templates/web/base/reports/index.html:99 +#, fuzzy +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "Antalet problem rapporterade för varje kategori, under de senaste sju dagarna." + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "OK" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "Offline-data rensad" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "Offline-uppdateringsdata sparade" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Äldre status" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "Äldst" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2313,35 +2350,41 @@ msgid "Open311 specification" msgstr "Open311 Specifikation" #: templates/web/base/admin/extra-metadata-form.html:53 -#, fuzzy msgid "Options" -msgstr "valfria" +msgstr "Alternativ" #: templates/web/base/alert/_list.html:84 msgid "Or subscribe by RSS" -msgstr "" +msgstr "Eller prenumerera via RSS" #: templates/web/base/admin/extra-metadata-form.html:8 msgid "Order" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +msgstr "Ordning" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Övrig" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "Andra kategorier" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "andra områden:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "Övergripande medelvärde" @@ -2359,19 +2402,19 @@ msgstr "Sidan hittas ej" msgid "Parent" msgstr "Förälder" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Partiell" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Lösenord (valfritt)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Lösenord:" @@ -2379,7 +2422,7 @@ msgstr "Lösenord:" msgid "Permalink" msgstr "Permanent länk" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "Rättigheter:" @@ -2387,19 +2430,25 @@ msgstr "Rättigheter:" msgid "Phone Reporter:" msgstr "Telefonrapportör:" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefonnummer" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Telefonnummer (valfritt)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "Telefonrapportör:" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefonnummer:" @@ -2415,7 +2464,7 @@ msgstr "Telefonnummer:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2441,12 +2490,18 @@ msgstr "Foton" msgid "Photos of recent nearby reports" msgstr "Foton från närliggande rapporter" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "Välj din kommun" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +#, fuzzy +msgid "Pick your ward" +msgstr "Välj din kommun" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Placera nålen på kartan" @@ -2468,25 +2523,34 @@ msgstr "Var vänlig, kortfattad och rakt på sak." msgid "Please check the passwords and try again" msgstr "Vänligen kontrollera lösenordet och prova igen" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Vänligen kontrollera att din epostadress är korrekt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Vänligen kontrollera att din epostadress är korrekt" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Välj en kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Vänligen korrigera felen nedan" @@ -2501,39 +2565,47 @@ 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:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Skriv in ett meddelande" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Skriv in ditt telefonnummer" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "Skriv in ett namn" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 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:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Skriv in ett lösenord" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Skriv in ett ärende" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Skriv in en giltig epostadress" @@ -2542,55 +2614,62 @@ msgstr "Skriv in en giltig epostadress" msgid "Please enter a valid email address" msgstr "Skriv in en giltig epostadress" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Skriv in ditt telefonnummer" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Skriv några detaljer" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Skriv in din epostadress" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Skriv in din epostadress" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Skriv in ditt förnamn" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Skriv in ditt namn och efternamn" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Skriv in ditt telefonnummer" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Skriv in ditt efternamn" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Skriv in din titel" @@ -2639,7 +2718,12 @@ msgstr "Observera att din uppdatering inte har publicerats än. msgid "Please note:" msgstr "Observera:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Tillhandahåll en offentlig uppdatering för den här rapporten." + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "Tillhandahåll en offentlig uppdatering för den här rapporten." @@ -2679,6 +2763,11 @@ msgstr "Ange om problemet har lösts eller ej" msgid "Please upload an image only" msgstr "Ladda upp endast en bild" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Skriv ett meddelande" @@ -2688,7 +2777,7 @@ msgid "Please write your update here" msgstr "Skriv din uppdatering här" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Skicka" @@ -2697,15 +2786,15 @@ msgstr "Skicka" msgid "Posted anonymously at %s" msgstr "Postat anonymt %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Postat av %s %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Postat av %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Postat av %s %s" @@ -2717,11 +2806,11 @@ msgstr "Byggd på Fi msgid "Previous" msgstr "Föregående" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "Prioriteringar" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "Prioritet" @@ -2738,7 +2827,7 @@ msgstr "Integritetsskydd och kakor" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Privat" @@ -2762,29 +2851,28 @@ msgstr "Rapport %s bekräftad" msgid "Problem %s sent to council %s" msgstr "Rapport %s skickad till %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Rapporter per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problemet markerat som öppet." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Problemets status ändrats baserat på utredningsresultat" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Problem" #: templates/web/base/alert/_list.html:22 -#, fuzzy msgid "Problems in an area" -msgstr "Problem inom området %s" +msgstr "Problem i ett område" #: templates/web/base/report/display_tools.html:22 msgid "Problems nearby" @@ -2799,11 +2887,10 @@ msgid "Problems recently reported fixed on FixMyStreet" msgstr "Problem nyligen rapporterade som lösta på FixaMinGata" #: templates/web/base/alert/_list.html:29 -#, fuzzy msgid "Problems within %.1fkm of %s" -msgstr "Problem inom %.1f km från denna position" +msgstr "Problem inom %.1f km av %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2815,9 +2902,8 @@ msgid "Problems within %s ward" msgstr "Problem inom området %s" #: perllib/FixMyStreet/Cobrand/UK.pm:263 perllib/FixMyStreet/Cobrand/UK.pm:275 -#, fuzzy msgid "Problems within %s ward, %s" -msgstr "Problem inom området %s" +msgstr "Problem inom %s område, %s" #. ("First %s is the body name, second %s the site name") #: templates/web/base/reports/body.html:0 @@ -2829,7 +2915,8 @@ msgstr "Problem inom %s, %s" msgid "Property address:" msgstr "Fastighetsadress:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Ge en uppdatering" @@ -2838,12 +2925,12 @@ msgstr "Ge en uppdatering" msgid "Provide update as" msgstr "Tillhandahåll uppdatering som" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Du måste inte ange namn och ett lösenord men om du gör det är det lättare att rapportera problem, lämna uppdateringar och hantera dina rapporter." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Att ange ett lösenord är valfritt, men om du gör det kommer du lättare att kunna rapportera problem, lämna uppdateringar och hantera dina anmälningar." @@ -2856,12 +2943,12 @@ msgstr "Offentliga uppgifter" msgid "Public response:" msgstr "Offentligt svar:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "Offentlig uppdatering:" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Publicera foto" @@ -2916,7 +3003,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2941,7 +3028,7 @@ msgstr "RSS-flöde för uppdateringar till denna rapport" msgid "Receive email when updates are left on this problem." msgstr "Erhåll epost när uppdateringar ges till denna rapport" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "Mottagen av %s kort därefter" @@ -2955,7 +3042,7 @@ msgstr "Senaste lokala rapporterna, %s" msgid "Recently reported problems" msgstr "Senaste rapporterade problemen" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "Senast uppdaterad" @@ -2964,14 +3051,12 @@ msgid "Remember that FixMyStreet is primarily for reporting physical problems th msgstr "Kom ihåg att FixaMinGata primärt är avsett för att rapportera fysiska problem som kan åtgärdas. Om ditt problem inte lämpar sig för att rapportera via den här webbsidan kan du kontakta din kommun direkt via deras webbsida." #: templates/web/base/admin/extra-metadata-form.html:68 -#, fuzzy msgid "Remove" -msgstr "Ta bort flagga" +msgstr "Ta bort" #: templates/web/base/admin/extra-metadata-form.html:4 -#, fuzzy msgid "Remove field" -msgstr "Ta bort flagga" +msgstr "Ta bort fält" #: templates/web/base/admin/report_blocks.html:23 msgid "Remove flag" @@ -2979,9 +3064,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:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "Ta bort från slutlista" @@ -2989,12 +3074,16 @@ msgstr "Ta bort från slutlista" msgid "Remove from site" msgstr "Ta bort från sajten" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Ta bort foto (kan inte ångras!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "Besvara användare:" @@ -3023,11 +3112,11 @@ msgstr "Rapportera missbruk" msgid "Report as" msgstr "Rapportera som" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Rappoort på %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "Rapportstatus:" @@ -3042,17 +3131,17 @@ msgstr "Rapportera ditt problem" msgid "Report, view, or discuss local problems" msgstr "Rapportera, visa, eller diskutera lokala problem" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Rapporterat anonymt %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Rapporterat tidigare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Rapporterat av %s den %s" @@ -3066,27 +3155,27 @@ msgstr "Rapporterad av:" msgid "Reported in the %s category" msgstr "Rapporterat i kategori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Anonym rapport i kategori %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Rapporterat i kategori %s av %s den %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Rapporterat av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Rapporterat av %s av %s den %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Rapporterat av %s i kategorin %s, anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapporterat av %s i kategorin %s av %s den %s" @@ -3095,8 +3184,8 @@ msgstr "Rapporterat av %s i kategorin %s av %s den %s" msgid "Reported:" msgstr "Rapporterad:" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3104,10 +3193,9 @@ msgstr "Rapporterad:" msgid "Reporting a problem" msgstr "Rapportera ett problem" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Rapporter" @@ -3120,35 +3208,32 @@ msgid "Reports awaiting approval" msgstr "Rapporter som väntar på att godkännas" #: templates/web/base/alert/_list.html:54 -#, fuzzy msgid "Reports by destination" -msgstr "Rapportstatus:" +msgstr "Rapporter efter mottagare" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 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." #: templates/web/base/alert/_list.html:15 msgid "Reports near %s are sent to different councils, depending on the type of problem." -msgstr "" +msgstr "Rapporter i närheten av %s skickas till olika förvaltare, beroende på vilken typ av problemet det är." #: templates/web/zurich/admin/index-sdm.html:10 msgid "Reports published" msgstr "Publicerade rapporter" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "Rapporter sparade offline." #: perllib/FixMyStreet/Cobrand/UK.pm:283 perllib/FixMyStreet/Cobrand/UK.pm:295 -#, fuzzy msgid "Reports sent to %s" -msgstr "Rappoort på %s" +msgstr "Rapporter skickas till %s" #: perllib/FixMyStreet/Cobrand/UK.pm:290 perllib/FixMyStreet/Cobrand/UK.pm:302 -#, fuzzy msgid "Reports sent to %s, within %s ward" -msgstr "RSS-flöde för %s, inom område %s" +msgstr "Rapporter skickade till %s, inom området %s" #: templates/web/base/admin/index.html:56 msgid "Reports waiting to be sent" @@ -3163,9 +3248,8 @@ msgid "Reputation threshold" msgstr "Anseendesgräns" #: templates/web/base/admin/extra-metadata-form.html:20 -#, fuzzy msgid "Required" -msgstr "obligatoriska" +msgstr "Obligatoriska" #: templates/web/base/admin/report_edit.html:84 msgid "Resend report" @@ -3192,21 +3276,22 @@ msgid "Response Templates" msgstr "Svarsmallar" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "Svarsmallar för %s" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "Återgå till orginalrapporten" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "Återgå till orginalstexten" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "Återgå till orginalsammanfattningen" @@ -3225,17 +3310,17 @@ 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:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Rotera åt vänster" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Rotera åt höger" @@ -3245,21 +3330,21 @@ 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:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Satellit" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "Spara + stäng som dublett" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3268,21 +3353,20 @@ msgstr "Spara ändringar" #: templates/web/base/admin/reportextrafields/edit.html:64 msgid "Save new fields" -msgstr "" +msgstr "Spara nya fält" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "Sparar rapporter offline" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:132 -#, fuzzy msgid "Scheduled" -msgstr "Åtgärd är schemalagd" +msgstr "Schemalagd" #: templates/web/base/admin/index.html:26 #: templates/web/base/admin/reports.html:1 @@ -3294,7 +3378,7 @@ msgstr "Sök rapporter" msgid "Search Users" msgstr "Sök användare" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Sök bland rapporter" @@ -3305,6 +3389,7 @@ msgid "Search:" msgstr "Sök:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Inga rapporter hittades." @@ -3317,7 +3402,7 @@ msgstr "Inga användare hittades." msgid "See our privacy policy" msgstr "Se vår integritetsskyddspolicy" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "Se användarinformation för rapporter skapade som kommunen" @@ -3326,14 +3411,14 @@ msgstr "Se användarinformation för rapporter skapade som kommunen" msgid "Select a body" msgstr "Välj en förvaltning" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Välj ett område" #: templates/web/base/admin/responsepriorities/edit.html:33 msgid "Select if this is the default priority" -msgstr "" +msgstr "Välj om detta är standardprioriteringen" #: templates/web/base/admin/category-checkboxes.html:6 msgid "Select:" @@ -3347,11 +3432,16 @@ msgstr "Skicka" msgid "Send extended Open311 statuses with service request updates" msgstr "Skicka utökade Open311-statusar med Service Request-uppdateringar" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "Skicka tillbaka rapport" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Skickades till %s, %s senare" @@ -3360,11 +3450,11 @@ msgid "Sent:" msgstr "Skickades:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Tjänst:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "Sätt till min nuvarande position" @@ -3373,9 +3463,9 @@ msgid "Share" msgstr "Dela" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "Slutlista" @@ -3383,19 +3473,19 @@ msgstr "Slutlista" msgid "Shortlist all visible" msgstr "Kortlista alla synliga" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "Satt på slutlistan" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "Satt på slutlistan av %s" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "Visa foto?" @@ -3403,40 +3493,37 @@ msgstr "Visa foto?" msgid "Show all updates" msgstr "Visa alla uppdateringar" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Visa mitt namn publikt" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "Visa namn offentligt?" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Visa äldre" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "Visa foto" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Visa kartnålar" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "Visa rapportörens namn" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "Visa lokala rapporter" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3447,12 +3534,17 @@ msgstr "Logga in" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "Sätt ett nytt lösenord och logga in med din e-postadress istället. När du klickar på länken i vårt e-postmeddelande så kommer ditt lösenord att uppdateras." +#: templates/web/base/auth/general.html:96 +#, fuzzy +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "Sätt ett nytt lösenord och logga in med din e-postadress istället. När du klickar på länken i vårt e-postmeddelande så kommer ditt lösenord att uppdateras." + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Logga in eller skapa nytt konto" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Logga ut" @@ -3470,7 +3562,7 @@ msgstr "" "En del ändpunkter kräver en API-nyckel för att kunna verifiera att rapporterna\n" "skickats från denna FixMyStreet-installation" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Foton från de senaste rapporterna" @@ -3483,15 +3575,20 @@ msgstr "Lite text att lokalisera" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "Länken är tyvärr ogiltig" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "Länken är tyvärr ogiltig" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3524,20 +3621,21 @@ 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:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "Sortera efter" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 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:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "Personal:" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Startdatum:" #: templates/web/base/admin/body.html:73 @@ -3547,18 +3645,20 @@ msgstr "Startdatum:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Status" -#: templates/web/base/report/update.html:48 -#, fuzzy +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 msgid "State changed to:" -msgstr "Spara ändringar" +msgstr "Tillstånd ändrat till:" #: templates/web/base/admin/report_edit.html:116 #: templates/web/base/admin/update_edit.html:28 @@ -3569,17 +3669,18 @@ msgstr "Spara ändringar" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 -#, fuzzy msgid "States" -msgstr "Status" +msgstr "Tillstånd" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Statistik" @@ -3589,7 +3690,7 @@ msgstr "Statistik" msgid "Status" msgstr "Status" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Fortfarande öppen, via frågeformulär, %s" @@ -3600,9 +3701,14 @@ msgstr "Street View" #: templates/web/base/admin/extra-metadata-form.html:46 msgid "String" -msgstr "" +msgstr "Sträng" + +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Underkategori: %s" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Underkategori: %s" @@ -3619,18 +3725,19 @@ msgstr "Ärende" msgid "Subject:" msgstr "Ärende:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Skicka" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3660,7 +3767,6 @@ msgid "Subscribe" msgstr "Prenumerera" #: templates/web/base/alert/_list.html:72 -#, fuzzy msgid "Subscribe by email" msgstr "Prenumerera med epost" @@ -3672,7 +3778,7 @@ msgstr "Sammanfatta problemet" msgid "Summarise your changes" msgstr "Sammanfatta dina ändringar" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3680,25 +3786,31 @@ msgstr "Sammanfatta dina ändringar" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Sammanfattning" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Sammanställningsrapporter" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Sammanställningsrapporter" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "Superanvändare:" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 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." -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Frågeresultat" @@ -3706,14 +3818,14 @@ msgstr "Frågeresultat" msgid "Template «%s»" msgstr "Mall «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Mallar" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Text" @@ -3721,7 +3833,7 @@ msgstr "Text" msgid "Text only version" msgstr "Version med endast text" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3748,7 +3860,7 @@ msgstr "Tack för din förfrågan" msgid "Thank you for your feedback" msgstr "Tack för dina synpunkter" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Tack för att du bifogade ett foto. Vi måste nu lokalisera ditt problem så var vänlig ange närliggande gatunamn och ort eller postnummer i rutan ovan :" @@ -3764,7 +3876,7 @@ msgstr "Bilden verkar inte ha laddats upp korrekt (%s), var vänlig försök ige 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Den positionen verkar inte vara i Sverige: försök gärna igen." @@ -3774,11 +3886,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Problemet har markerats som skickat." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Rapportern kommer nu att skickas om." @@ -3810,8 +3922,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3832,7 +3944,7 @@ msgstr "Förvaltningens namn identifierar förvaltningen (till exempel, Sand #: templates/web/base/admin/extra-metadata-form.html:12 msgid "The code used to store this field value in the database. e.g. address would be available as problem.extra.address in the templates." -msgstr "" +msgstr "Koden används för att spara det här fältvärdet i databasen, t.ex. address skulle bli tillgänglig som problem.extra.address i mallarna." #: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 @@ -3844,14 +3956,14 @@ msgstr "Fyll i information om problemet nedan. Kommunen kommer inte att kunna hj 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:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Felet var: %s" #: templates/web/base/admin/extra-metadata-form.html:30 msgid "The field name as shown to the user on the report form." -msgstr "" +msgstr "Det fältnamn som visas för användarna i rapportformuläret." #: templates/web/base/open311/index.html:78 msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." @@ -3887,7 +3999,7 @@ msgstr "De senaste problemen rapporterade som lösta av användare" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "De senaste problemen inom {{NAME}}'s gräns rapporterade av användare" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 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." @@ -3897,7 +4009,7 @@ msgstr "Listan av tillgängliga områden förses av MapIt-tjänsten på %s." #: templates/web/base/admin/extra-metadata-form.html:6 msgid "The ordering of this field on the report page. Fields are shown in ascending order according to this value." -msgstr "" +msgstr "Fältordningen på rapportsidan. Fält visas i stigande ordning efter detta värde." #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:26 @@ -3910,9 +4022,9 @@ msgstr "Den sökta adressen '%s' hittades inte på denna server" #: templates/web/base/admin/extra-metadata-form.html:42 msgid "The type of input field to show to the user. Text is a simple text field, List is a drop-down selection." -msgstr "" +msgstr "Typen av fält som visas för användaren. Text är ett simpelt textfält, List är en rullgardinsmeny." -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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" @@ -3923,33 +4035,38 @@ msgid "" " Names are not necessarily unique." msgstr "Användarens namn visas offentligt i rapporter som inte har markerats som anonyma. Namn är inte nödvändigtvis unika." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Det finns inga rapporter att visa." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "Felaktigt lösenord eller epostadress. Om du har glömt bort ditt lösenord, eller om du inte har ett lösenord, kan du fylla i ‘logga in via epost’." - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Felaktigt lösenord eller epostadress. Försök igen." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "Felaktigt lösenord eller epostadress. Om du har glömt bort ditt lösenord, eller om du inte har ett lösenord, kan du fylla i ‘logga in via epost’." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Det uppstod ett problem med din uppdatering. Försök igen." @@ -3957,7 +4074,7 @@ msgstr "Det uppstod ett problem med din uppdatering. Försök igen." msgid "There were problems with your report. Please see below." msgstr "Det uppstod ett problem med din rapport. Se nedan." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Det uppstod ett problem med din uppdatering. Se nedan." @@ -4012,26 +4129,34 @@ msgid "" " 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:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Den här informationen krävs" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Det här är en utvecklingsplats: olika saker kan komma att gå sönder vid olika tidpunkter och databasen kommer att rutinmässigt raderas." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "Detta hål i gatan har varit här i två månader och..." @@ -4048,7 +4173,7 @@ msgstr "Det här problemet har inte lösts" msgid "This problem is still ongoing" msgstr "Detta problem är fortfarande aktuellt" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: 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:" @@ -4058,23 +4183,23 @@ msgstr "Den här rapporten är en dublett. Lämna uppdateringar på den ursprung msgid "This report is awaiting moderation." msgstr "Den här rapporten väntar på att granskas." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Den här rapporten är markerad som stängd" -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Det här problemet är markerat som löst" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Den här rapportern är öppen" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Den här rapporten skickades anonymt." -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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." @@ -4085,7 +4210,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -4097,93 +4222,87 @@ msgstr "Tips för perfekta foton" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Titel" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Titel:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "Skriv in postnummer eller gatunamn och ort för %s för att se rapporter kring den platsen." -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Skriv in postnummer eller gatunamn och ort för att se rapporter kring den platsen." #: templates/web/base/admin/reportextrafields/edit.html:19 msgid "To limit this collection of fields to a single cobrand, select it here." -msgstr "" +msgstr "För att begränsa den här fältgruppen till en specifik FixMyStreet-variant, välj den här." #: templates/web/base/admin/reportextrafields/edit.html:40 msgid "To limit this collection of fields to a single language, select it here." -msgstr "" +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:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 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" -#: templates/web/base/reports/index.html:97 +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" +msgstr "" + +#: templates/web/base/reports/index.html:126 msgid "Top 5 most used categories" -msgstr "De fem mest använda kategorierna" +msgstr "De mest använda kategorierna" -#: templates/web/base/reports/index.html:83 +#: templates/web/base/reports/index.html:111 msgid "Top 5 responsive councils" -msgstr "De fem mest responsiva kommunerna" +msgstr "De mest responsiva kommunerna" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" +msgstr "" + +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 msgid "Total" msgstr "Totalt" -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" -msgstr "Markerade, totalt" - -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" -msgstr "Markerade som lösta, totalt" - -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" -msgstr "Ej markerade, totalt" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "Uppdateringar mottagna, totalt" - -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "Krävs trafikövervakning?" #: templates/web/base/admin/_translations.html:7 msgid "Translation" -msgstr "" +msgstr "Översättning" #: templates/web/base/admin/_translations.html:2 msgid "Translations" -msgstr "" +msgstr "Översättningar" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "Anförtrodd av kommunen:" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 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:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "Anförtrodd:" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Försök igen" @@ -4196,9 +4315,13 @@ msgstr "Prova att skicka ett e-brev till oss direkt:" #: templates/web/base/admin/states/index.html:10 #: templates/web/base/admin/states/index.html:100 msgid "Type" +msgstr "Typ" + +#: templates/web/base/admin/user-form.html:38 +msgid "Unban" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: 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 @@ -4207,15 +4330,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Obekräftat" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "ej lösta rapporter" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Okänt" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Okänd feltyp" @@ -4225,13 +4344,14 @@ msgstr "Okänd feltyp" msgid "Unknown error" msgstr "Okänt fel" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Okänt problemnummer" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "Okortlistade" @@ -4256,12 +4376,12 @@ msgstr "Uppdateringen nedan tillagd anonymt %s" msgid "Update below added by %s at %s" msgstr "Uppdateringen nedan tillagd av %s den %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Uppdatera förvaltning" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Uppdatering per status" @@ -4269,16 +4389,16 @@ msgstr "Uppdatering per status" msgid "Update by {{name}}" msgstr "Uppdatering av {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Uppdateringen ändrade statusen till %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Uppdateringen markerade problemet som löst" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Uppdateringen öppnade rapporten på nytt" @@ -4292,20 +4412,18 @@ msgstr "Uppdaterad status" msgid "Updated" msgstr "Uppdaterad" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 -#, fuzzy +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 msgid "Updated by %s (%s) at %s" -msgstr "Postat av %s (%s) %s" +msgstr "Uppdaterad av %s (%s) %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 -#, fuzzy +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 msgid "Updated by %s at %s" -msgstr "Postat av %s %s" +msgstr "Uppdaterad av %s %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4313,7 +4431,7 @@ msgid "Updated!" msgstr "Uppdaterad!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Uppdateringar" @@ -4360,40 +4478,81 @@ msgstr "Använde kartan" msgid "User ID to attribute fetched comments to" msgstr "Användar-ID att attribuera hämtade kommentarer till" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Epostadressen tillagd till missbrukslistan" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Epostadressen finns redan i missbrukslistan" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Användarflaggan borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Användaren flaggad" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "Användaren har markerat som löst" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "I missbrukstabellen?" #: templates/web/base/admin/users.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." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Användare" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Användare" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 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:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Värden uppdaterade" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Ny e-postadress:" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Ditt telefonnummer" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4415,12 +4574,7 @@ msgstr "Visa en position" msgid "Viewing a problem" msgstr "Visa ett problem" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "VTI" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "Stadsdel:" @@ -4430,20 +4584,25 @@ msgstr "Delområden i denna kommun" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Vi hittade fler än en träff. Vi visar upp till tio träffar nedan. Om ingen av dem överenstämmer med vald adress kan du söka igen. Om du söker efter en gata, lägg till stad efteråt: \"Vasagatan, Göteborg\" för att förfina sökningen." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Vi hittade mer än en träff för den problemreferensen:" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "Vi hittade mer än en träff för den problemreferensen:" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "Skriv in din e-postadress nedan." -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4451,6 +4610,12 @@ msgstr "Det här problemet kan höra till %s. Dessvärre har vi ingen kontaktinf msgid "We send it to the council on your behalf" msgstr "Vi skickar rapportern till berörd kommun" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "Vi hittade fler än en träff. Vi visar upp till tio träffar nedan. Om ingen av dem överenstämmer med vald adress kan du söka igen. Om du söker efter en gata, lägg till stad efteråt: \"Vasagatan, Göteborg\" för att förfina sökningen." + #: 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." @@ -4460,9 +4625,9 @@ msgstr "Vi kommer endast att använda din information i enlighet med vår MaPit." msgstr "Vid sökningar är det också möjligt att söka efter agency_responsible för att begränsa svaren till de som skickats till en enstaka kommun. Söktermen för administrations-IDt erhålls av MapIt." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "Vill du bidra till FixaMinGata? Vår kod är öppen programvara och tillgänglig på fixmystreet.org." @@ -4528,16 +4697,7 @@ msgstr "Om du skriver ditt meddelande endast med versaler blir det svårare att msgid "Wrong location? Just click again on the map." msgstr "Fel plats? Klicka i så fall på kartan igen." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "ÅTI" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "År" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4552,7 +4712,7 @@ msgstr "År" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Ja" @@ -4565,7 +4725,7 @@ msgstr "Ja, jag har ett lösenord" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "Du anmäler att den här problemrapporten var modererad i onödan:" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "Du är offline" @@ -4582,13 +4742,13 @@ msgstr "Du vill anmäla missbruk, personlig inforation, eller motsvarande i föl 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:96 +#: templates/web/base/admin/user-form.html:114 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." #: templates/web/base/alert/_list.html:18 msgid "You can choose to subscribe to all problems reported in an area, or reports based on their destination." -msgstr "" +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:115 msgid "You can contact technical support on %s" @@ -4608,7 +4768,7 @@ 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:93 +#: templates/web/base/admin/body-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." @@ -4616,7 +4776,7 @@ msgstr "Du kan markera en förvaltning som borttagen om du inte vill att den ska 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:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "Du har %s sparad att skicka." @@ -4643,18 +4803,38 @@ msgstr "Du har blivit utloggad" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Du har markerat problemet med den gröna nålmarkören på kartan. Om det inte är rätt position, klicka på rätt plats på kartan igen." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Du har bekräftat din e-postadress." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Du har bekräftat din e-postadress." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Du har bekräftat din e-postadress." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Du har bekräftat din e-postadress." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Du har loggats in. Verifiera att dina uppgifter stämmer:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Du har bekräftat din e-postadress." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Du har inte skapat några rapporter än. Rapportera ett problem nu." @@ -4678,36 +4858,43 @@ msgid "Your Reports" msgstr "Dina rapporter" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "Ditt konto" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Din epostadress" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Din epostadress" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "Din epostadress" + #: 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" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4718,19 +4905,19 @@ msgstr "Ditt namn och efternamn" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "Ditt namn har redan skickats till %s, men vi kan dölja det på den här sidan:" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "Ditt namn har dolts från alla dina rapporter och uppdateringar." -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "Ditt namn har dolts." -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "Dina offline-rapporter" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4741,8 +4928,8 @@ msgstr "Ditt lösenord" msgid "Your password has been changed" msgstr "Ditt lösenord har ändrats" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Ditt telefonnummer" @@ -4751,7 +4938,7 @@ msgstr "Ditt telefonnummer" msgid "Your report" msgstr "Din rapport" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Dina rapporter" @@ -4760,28 +4947,43 @@ msgstr "Dina rapporter" msgid "Your shortlist" msgstr "Din slutlista" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Ditt namn har dolts." + +#: templates/web/base/js/translation_strings.html:70 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." -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Dina uppdateringar" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "Dig själv" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "samtliga" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 -msgid "and a defect raised" +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" msgstr "" +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 +msgid "and a defect raised" +msgstr "och en defekt uppförd" + #: templates/web/base/admin/timeline.html:4 msgid "by %s" msgstr "av %s" @@ -4795,8 +4997,8 @@ msgstr "kommun" msgid "didn't use map" msgstr "använde inte kartan" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "ex.v. '%s' eller '%s'" @@ -4819,23 +5021,23 @@ msgstr "senast uppdaterad %s" msgid "less than a minute" msgstr "mindre än en minut" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "Ej tillgängligt" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "inga" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 -#, fuzzy +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 msgid "not the council's responsibility" -msgstr "markerad som ej kommunens ansvar" +msgstr "inte kommunens ansvar" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "eller hitta min position automatiskt." @@ -4872,11 +5074,10 @@ msgid "there is no pin shown as the user did not use the map" msgstr "det finns ingen kartmarkering eftersom användaren inte använde kartan" #: templates/web/base/alert/_list.html:1 -#, fuzzy msgid "this location" -msgstr "Visa en position" +msgstr "den här platsen" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "den här typen av problem" @@ -4884,11 +5085,11 @@ msgstr "den här typen av problem" msgid "today" msgstr "idag" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "uppdatering" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "uppdateringar" @@ -4896,14 +5097,24 @@ msgstr "uppdateringar" msgid "used map" msgstr "använde kartan" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "användaren är från samma kommun som problemet - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "användaren är inte problemägare" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Epostadressen finns redan i missbrukslistan" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Ta bort från slutlista" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4965,40 +5176,40 @@ msgid_plural "%d years" msgstr[0] "%d år" msgstr[1] "%d år" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "%s dag" msgstr[1] "%s dagar" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "%s problem markerat som löst" msgstr[1] "%s problem markerade som lösta" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "%s problem rapporterat" msgstr[1] "%s problem rapporterade" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "%s rapport" msgstr[1] "%s rapporter" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" -msgstr[0] "%s problemuppdatering" -msgstr[1] "%s problemuppdateringar" +msgstr[0] "%s uppdatering av rapporter" +msgstr[1] "%s uppdateringar av rapporter" #: templates/web/base/front/stats.html:19 #, perl-format @@ -5063,107 +5274,105 @@ msgid_plural "reports" msgstr[0] "rapport" msgstr[1] "rapporter" -#~ msgid "" -#~ "%s sends different categories of problem\n" -#~ "to the appropriate council, so problems within the boundary of a particular council\n" -#~ "might not match the problems sent to that council. For example, a graffiti report\n" -#~ "will be sent to the district council, so will appear in both of the district\n" -#~ "council’s alerts, but will only appear in the \"Within the boundary\" alert\n" -#~ "for the county council." -#~ msgstr "%s skickar olika kategorier av rapporter till olika enheter inom en kommun eller län. Problem som rapporteras inom en viss kommun dyker därför inte nödvändigtvis upp i listan över rapporter till den kommunen. Exempelvis kan en rapport om en väg skickas till Vägverket snarare än kommunen. Rapporten dyker då inte upp i listan över rapporter till kommunen, men dyker upp om man söker alla rapporter inom ett visst avstånd." +#, fuzzy +#~ msgid "Current state of filtered reports" +#~ msgstr "Dina offline-rapporter" + +#~ msgid "(Email in abuse table)" +#~ msgstr "(Epost i missbrukstabellen)" -#~ msgid "%s ward, %s" -#~ msgstr "Administrativa området %s, %s" +#~ msgid "14-30 days old" +#~ msgstr "14-30 dagar gamla" -#~ msgid "%s, within %s ward" -#~ msgstr "%s inom det administrativa området %s" +#~ msgid "7-14 days old" +#~ msgstr "7-14 dagar gamla" -#~ msgid "(alternatively the RSS feed can be customised, within %s)" -#~ msgstr "(alternativt kan RSS-flödet konfigureras inom %s)" +#~ msgid "Average time to council marking fixed (days)" +#~ msgstr "Genomsnittlig tid för kommun att markera som löst (dagar)" -#~ msgid "-- Pick a property type --" -#~ msgstr "-- Välj en fastighetstyp --" +#~ msgid "Average time to first council state change (days)" +#~ msgstr "Genomsnittlig tid för kommun till första rapportstatusändring (dagar)" -#~ msgid "Closed reports" -#~ msgstr "stängda rapporter" +#~ msgid "By Date" +#~ msgstr "Efter datum" -#~ msgid "Closed:" -#~ msgstr "Stängd:" +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Klicka här eller ange som dd/mm/yyyy" -#~ msgid "Duplicate" -#~ msgstr "Finns redan" +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Bekräftade rapporter mellan %s och %s" -#~ msgid "Fixed reports" -#~ msgstr "lösta rapporter" +#~ msgid "Council has marked as closed" +#~ msgstr "Kommun har markerat som stängd" -#~ msgid "Fixed:" -#~ msgstr "Löst:" +#~ msgid "Council has marked as fixed" +#~ msgstr "Kommun har markerat som löst" -#~ msgid "Here are the types of local problem alerts for ‘%s’." -#~ msgstr "Här är de olika typerna för lokala problem för ‘%s’" +#~ msgid "Council has marked as in progress" +#~ msgstr "Kommun har markerat som pågående" -#~ msgid "In Progress" -#~ msgstr "Pågående" +#~ msgid "Council has marked as investigating" +#~ msgstr "Kommun har markerat som under utredning" -#~ msgid "Internal referral" -#~ msgstr "Interna refereringar" +#~ msgid "Council has marked as planned" +#~ msgstr "Kommun har markerat som planerad" -#~ msgid "Investigating" -#~ msgstr "Utredes" +#~ msgid "Get Count" +#~ msgstr "Hämta Antal" -#~ msgid "No further action" -#~ msgstr "Kunde inte åtgärda" +#~ msgid "Hide old" +#~ msgstr "Göm äldre" -#~ msgid "Not Responsible" -#~ msgstr "Ej ansvarig" +#~ msgid "Include unconfirmed reports" +#~ msgstr "Inkludera obekräftade rapporter" -#~ msgid "Or problems reported to:" -#~ msgstr "Eller problem rapporterade til:" +#~ msgid "Invalid end date" +#~ msgstr "Inkorrekt slutdatum" -#~ msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" -#~ msgstr "Du kan också prenumerera på bevakningar baserat på vilken kommun du bor i:" +#~ msgid "Invalid start date" +#~ msgstr "Inkorrekt startdatum" -#~ msgid "Please choose a property type" -#~ msgstr "Välj en fastighetstyp" +#~ msgid "Last 4 weeks" +#~ msgstr "De senaste fyra veckorna" -#~ msgid "Problems within the boundary of:" -#~ msgstr "Problem inom gränsen för:" +#~ msgid "Less than 7 days old" +#~ msgstr "Mindre än sju dagar gammal" -#~ msgid "Select which type of alert you’d like and click the button for an RSS feed, or enter your email address to subscribe to an email alert." -#~ msgstr "Välj vilken kategori av rapporter du vill få och klicka knappen för ett RSS-flöde eller ange din epostadress för att prenumerera via epost." +#~ msgid "No council" +#~ msgstr "Ingen kommun" -#~ msgid "The simplest alert is our geographic one:" -#~ msgstr "Vår enklaste bevakning är för rapporter inom ett geografiskt område:" +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Observera att när vi listar obegräftade rapporter använder vi datumet när rapporten skapades, vilket inte nödvändigtvis är samma månad som när rapporten bekräftades, så vissa avvikelser kan uppstå." -#~ msgid "closed as a duplicate report" -#~ msgstr "markerad som dubblett av rapport" +#~ msgid "Show old" +#~ msgstr "Visa äldre" -#~ msgid "marked as action scheduled" -#~ msgstr "markerad som åtgärd schemalagd" +#~ msgid "Total marked" +#~ msgstr "Markerade, totalt" -#~ msgid "marked as an internal referral" -#~ msgstr "markerad som intern referering" +#~ msgid "Total marked as fixed" +#~ msgstr "Markerade som lösta, totalt" -#~ msgid "marked as closed" -#~ msgstr "markerad som stängd" +#~ msgid "Total not marked" +#~ msgstr "Ej markerade, totalt" -#~ msgid "marked as fixed" -#~ msgstr "markerad som löst" +#~ msgid "Total reports received" +#~ msgstr "Uppdateringar mottagna, totalt" -#~ msgid "marked as in progress" -#~ msgstr "markerad som pågående" +#~ msgid "Unfixed reports" +#~ msgstr "ej lösta rapporter" -#~ msgid "marked as investigating" -#~ msgstr "markerad som under utredning" +#~ msgid "User has marked as fixed" +#~ msgstr "Användaren har markerat som löst" -#~ msgid "marked as no further action" -#~ msgstr "markerad som kunde inte åtgärda" +#~ msgid "WTD" +#~ msgstr "VTI" -#~ msgid "marked as planned" -#~ msgstr "markerad som planerad" +#~ msgid "Week To Date" +#~ msgstr "Veckor Till Idag" -#~ msgid "or" -#~ msgstr "eller" +#~ msgid "YTD" +#~ msgstr "ÅTI" -#~ msgid "reopened" -#~ msgstr "öppnat på nytt" +#~ msgid "Year" +#~ msgstr "År" diff --git a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po index 3753b1218a5..0b03326bd0f 100644 --- a/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/tr_TR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Turkish (Turkey) (https://www.transifex.com/mysociety/teams/12067/tr_TR/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "ve" @@ -32,6 +32,10 @@ msgstr "ve" msgid " or " msgstr "veya" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr " %s tarafından %d yayına hazırlanır" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s kurul irtibatları – %s onaylanmış, %s onaylanmamış" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s güncellemeler" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s bildirim – %s cevaplandı (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s bildirim – %s cevaplandı (%s%%)" msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "© OpenStreetMapkatkıda bulunanlar" @@ -99,11 +108,6 @@ msgstr "© OpenStreetMap< msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(E-posta kara listede)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(duvar yazısı (grafiti), moloz atma, kırık kaldırım döşeme, ya da sokak aydınlatma gibi)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -161,8 +165,8 @@ msgstr "(her ikisine de gönderildi)" msgid "(we also have RSS feeds for problems within %s)" msgstr "%s içerisindeki problemlerle alakalı RSS besleme" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Kategori seçiniz--" @@ -175,14 +179,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -194,16 +190,16 @@ msgstr "" "Bu muhtemelen \"kapalı alanın\" neden boş olduğunu(aşağıda)
\n" "Belkide yapılandırma dosyanıza bazı MAPIT_TYPES eklemelisiniz?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -212,33 +208,52 @@ msgstr "" msgid "%s live problems" msgstr "%s güncel problemler" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Hayır E mail yoluyla raporumu onaylamama izin ver" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Hayır E mail yoluyla raporumu onaylamama izin ver" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Hayır Güncellemelerimi e-posta yoluyla onaylamama izin ver" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Hayır Güncellemelerimi e-posta yoluyla onaylamama izin ver" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Hayır e-posta yoluyla giriş yapmama izin ver" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Hayır e-posta yoluyla giriş yapmama izin ver" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Evet şifrem var" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -256,11 +271,17 @@ 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Bölüm ekle" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Email adresini engelle" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -283,11 +304,17 @@ msgstr "Yeni kategori ekle" msgid "Add option" msgstr "(isteğe bağlı)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +msgid "Add phone number" +msgstr "(Telefon Numarası Yok)" + #: templates/web/base/report/_item.html:10 #: templates/web/base/report/_item.html:16 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -297,23 +324,23 @@ msgstr "" msgid "Add user" msgstr "Kullanıcı ekle" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Eklenmiş %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -337,9 +364,10 @@ msgstr "Uyarı %d engellendi (oluşturuldu %s)" msgid "Alert me to future updates" msgstr "Güncellemeleri bildir" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -348,12 +376,13 @@ msgstr "" msgid "All Reports" msgstr "Tüm Bildirimler" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Tüm raporlar CSV olarak" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -369,17 +398,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Tüm bildirimler" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "%s ve %s arasındaki tüm bildirimler" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -417,7 +446,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -428,7 +458,7 @@ msgstr "" msgid "Area covered" msgstr "Kapsadığı alan" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -442,7 +472,7 @@ msgid "Assign to competent body:" msgstr "" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Farklı bir kategori atamak:" @@ -454,7 +484,7 @@ msgstr "Dışarıdan bir organ atamak:" msgid "Assign to subdivision:" msgstr "Alt bölüm atamak:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -470,12 +500,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Sorumlu değildir" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -483,18 +518,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -508,20 +535,21 @@ msgstr "Denetleme bekliyor" msgid "Back" msgstr "Geri" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Email adresini engelle" +#, fuzzy +msgid "Ban user" +msgstr "Kullanıcıyı seç" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Bölümler" @@ -532,14 +560,10 @@ msgstr "Bölümler" msgid "Body" msgstr "Bölüm" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Bölüm:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "Tarihe Göre" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -552,8 +576,9 @@ 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:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -564,30 +589,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Kategori" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Kategori" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 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:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -595,17 +626,17 @@ msgstr "Bu kategori için problemlerin onarılma süresi > 4 hafta" msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Kategori: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -613,10 +644,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Şifreyi değiştir" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(Telefon Numarası Yok)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -646,19 +683,14 @@ 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "dd/mm/yyyy olarak girin ya da buraya tıklayın" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Haritayı tıklayarak problemi bildirin" @@ -686,18 +718,19 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Kapalı" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Kurul tarafından kapatıldı" @@ -712,16 +745,17 @@ msgid "Cobrand" msgstr "Cobrand " #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Cobrand data:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -729,7 +763,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Yapılandırma" @@ -738,7 +772,7 @@ msgstr "Yapılandırma" msgid "Confirm" msgstr "Onayla" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Hesabı onayla" @@ -757,14 +791,10 @@ msgstr "Onay" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Onaylandı" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "%s ve %s arası onaylanmış raporlar" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -791,8 +821,8 @@ msgstr "Grupla bağlantı kur" msgid "Coordinates:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Kullanıcı bulunamadı" @@ -810,43 +840,16 @@ msgstr "Kurul" msgid "Council contacts for %s" msgstr "Kurula ulaşmak için %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "Kurul ref: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Kurul:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Sayma" @@ -868,39 +871,44 @@ msgstr "Kategori oluştur" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Oluşturuldu" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Oluşturuldu:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Güncel durum" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -911,14 +919,14 @@ msgstr "Şu anda hiçbir organları oluşturulmamıştır." msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Kontrol Paneli " -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Alt komisyon tarafından 5 iş günü içinde üstesinden gelinilecek" @@ -930,12 +938,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "" @@ -946,8 +954,8 @@ msgstr "" msgid "Deleted" msgstr "Silindi" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -963,6 +971,10 @@ msgstr "Tanım" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -975,6 +987,10 @@ msgstr "Detaylar" msgid "Details:" msgstr "Detaylar:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Devredildi" @@ -988,8 +1004,8 @@ msgstr "" msgid "Diligency prize league table" msgstr "Özenle hazırlanmış işbirliği tablosu" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -998,7 +1014,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1006,7 +1022,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1026,11 +1042,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1050,9 +1066,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Ekle" @@ -1062,33 +1079,33 @@ msgstr "Ekle" msgid "Edit body details" msgstr "Bölümün detaylarını düzenle" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Sorunu düzenleme %d" @@ -1109,7 +1126,6 @@ msgstr "Editör" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1117,17 +1133,20 @@ msgstr "Editör" msgid "Email" msgstr "E-posta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "E-posta kara listeye eklendi" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Şifre (isteğe bağlı)" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "E-posta uyarısı oluşturuldu" @@ -1136,19 +1155,18 @@ msgstr "E-posta uyarısı oluşturuldu" msgid "Email alert deleted" msgstr "E-posta uyarısı silindi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "E-posta kara listede" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "E-posta:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "E-posta: %s" @@ -1165,16 +1183,17 @@ 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/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Bitiş Tarihi:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1195,14 +1214,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Yakınlardaki bir posta kodu, cadde veya bölge ismi giriniz" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Yakınlardaki bir cadde ve bölge ismi giriniz" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Şifre gir" @@ -1220,8 +1239,8 @@ msgstr "Problem hakkında detaylı bilgi giriniz" msgid "Error" msgstr "Hata" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "" @@ -1246,7 +1265,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1262,7 +1281,7 @@ msgstr "" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "Harici URL " @@ -1274,7 +1293,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1286,7 +1305,7 @@ msgstr "İlave veriler:" msgid "Extra data:" msgstr "İlave veriler:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1316,21 +1335,22 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Sorun çözüldü" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Sorun çözüldü- Kurul" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Sorun çözüldü- Kullanıcı" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Silindi olarak seçildi" @@ -1338,7 +1358,7 @@ msgstr "Silindi olarak seçildi" msgid "Flag user" msgstr "Kullanıcıyı seç" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Seçildi" @@ -1347,7 +1367,7 @@ msgstr "Seçildi" msgid "Flagged reports and users" msgstr "Seçilen bildirimler ve kullanıcılar" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Seçilen kullanıcılar etiketlilersayfasında listelendi." @@ -1355,8 +1375,8 @@ msgstr "Seçilen kullanıcılar etiketlilersayfasında listelen msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "Seçilenler:" @@ -1376,7 +1396,7 @@ msgstr "" 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ı." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1396,8 +1416,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Sıkça Sorulan Sorular" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1430,12 +1454,12 @@ msgstr "Problemin çözüldüğünü duymak güzel" #: 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Git" @@ -1443,7 +1467,7 @@ msgstr "Git" msgid "Going to send questionnaire?" msgstr "Anket gönderecek misiniz?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1451,6 +1475,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "Zamanla oluşan problemlerin duruma göre grafikleri" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "%s tarafından" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Bu sorun giderildi mi? " @@ -1471,21 +1504,26 @@ msgstr "Yardım" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Son zamanlarda bildirilen çevredeki fotoğraflar " + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Merhaba %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Gizli" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1506,21 +1544,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Eskileri gizle" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "İğneler gizle" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1532,7 +1567,7 @@ msgstr "" msgid "History" msgstr "Tarihçe" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Anasayfa" @@ -1589,12 +1624,20 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 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/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 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." @@ -1603,7 +1646,7 @@ msgstr "Sorununuzun durumu ile ilgili daha fazla bilgi almak istiyorsanız, lüt 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1612,7 +1655,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1684,11 +1727,7 @@ msgstr "Gelen kutusu boş " msgid "Include reporter personal details" msgstr "Bildiren kişinin kişisel bilgilerini dahil et" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Onaylanmamış bildirimleri dahil et" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Hatalı sahip_fotoğraf değer \"%s\"" @@ -1700,7 +1739,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1712,26 +1751,18 @@ msgstr "İç notlar" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Geçersiz ajans_sorumlu değer %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Geçersiz bitiş tarihi" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Geçersiz format %s belirlenmiş." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Geçersiz başlangıç tarihi" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr " FAQs'ı kontrol et bu çözüme ulaşmak için en hızlı yoldur." @@ -1750,7 +1781,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1775,12 +1806,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1806,18 +1832,14 @@ msgstr "Son güncelleme:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1826,13 +1848,13 @@ msgstr "" msgid "List all reported problems" msgstr "Bildirilmiş problemleri güncelle" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Yükleniyor..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1864,12 +1886,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1877,11 +1902,11 @@ msgstr "" msgid "MAP" msgstr "HARİTA" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1893,11 +1918,11 @@ msgstr "Harita" msgid "Mark as sent" msgstr "Gönderildi olarak işaretle" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1917,45 +1942,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Eksik yetki_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Bir iş gününe bölünmüş bir şekilde yönetilmiştir" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Ay" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1973,9 +1998,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1986,19 +2011,23 @@ msgstr "İsim" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "İsim:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "İsim: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2008,12 +2037,12 @@ msgstr "" msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2027,19 +2056,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Yeni bölüm eklendi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Yeni kategori bilgisi eklendi" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2060,6 +2093,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(Telefon Numarası Yok)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2089,18 +2127,19 @@ msgstr "FixMyStreet'teki {{NAME}} sınırları içindeki yeni problemler" msgid "New reports" msgstr "Yeni bildiriler" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Yeni durum" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2108,7 +2147,7 @@ msgstr "" msgid "Next" msgstr "Sonraki" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2120,22 +2159,18 @@ msgstr "Sonraki" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Hayır" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Birim yok" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Kurul yok" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Seçilmiş kurul yok" @@ -2165,6 +2200,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Herhangi bir geri dönüş olmamıştır" @@ -2187,15 +2226,15 @@ msgstr "Destek sağlayıcı yok" msgid "None" msgstr "Hiçbiri" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2214,7 +2253,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "Benim bölümüm için değil" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Daha önce bildirilmedi" @@ -2228,10 +2267,6 @@ msgstr "Kurula bildirilmemiş" msgid "Note" msgstr "Not" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2259,37 +2294,46 @@ msgstr "Şimdi bildirimini&hellip kaydet;" msgid "Now to submit your update…" msgstr "" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "Tamam" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Eski durum" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2328,23 +2372,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Diğer" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "diğer bölgeler:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2362,19 +2413,19 @@ msgstr "Sayfa bulunamadı" msgid "Parent" msgstr "Ebeveyn" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Kısmi" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Şifre (isteğe bağlı)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Şifre:" @@ -2382,7 +2433,7 @@ msgstr "Şifre:" msgid "Permalink" msgstr "Permalink" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2390,19 +2441,24 @@ msgstr "" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Telefon numarası" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Telefon numarası (isteğe bağlı)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Telefon:" @@ -2418,7 +2474,7 @@ msgstr "Telefon:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2444,12 +2500,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "Son zamanlarda bildirilen çevredeki fotoğraflar " -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Harita üzerine işaretleyin" @@ -2471,25 +2532,34 @@ msgstr "Kibar, açık ve hedef odaklı olun." msgid "Please check the passwords and try again" msgstr "Şifreyi kontrol ediniz ve tekrar deneyiniz" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "E-posta adresinizin doğruluğunu kontrol ediniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "E-posta adresinizin doğruluğunu kontrol ediniz" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Kategori seçiniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Lütfen aşağıdaki hataları düzeltiniz" @@ -2504,39 +2574,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Mesaj giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Lütfen telefon numaranızı gririniz" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Şifre giriniz" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Konu giriniz" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Geçerli e-posta giriniz" @@ -2545,55 +2623,62 @@ msgstr "Geçerli e-posta giriniz" msgid "Please enter a valid email address" msgstr "Geçerli e-posta adresi giriniz" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Lütfen telefon numaranızı gririniz" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Lütfen bir kaç ayrıntı giriniz" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "E-posta giriniz" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Lütfen mail adresinizi giriniz" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Ad giriniz" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Lütfen isminizi giriniz" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Lütfen telefon numaranızı gririniz" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Soyad giriniz" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Konu başlığı giriniz" @@ -2642,7 +2727,12 @@ msgstr "" msgid "Please note:" msgstr "Lütfen dikkat:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Bu bildirimi neden paylaşatığınza dair lütfen bir kaç açıklama yapın" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2682,6 +2772,11 @@ msgstr "Problemin giderilmiş veya giderilmemiş olması durumunu bildiriniz lü msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Mesaj gönderin" @@ -2691,7 +2786,7 @@ msgid "Please write your update here" msgstr "Güncellemeleri buraya yazınız" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Paylaş" @@ -2700,15 +2795,15 @@ msgstr "Paylaş" msgid "Posted anonymously at %s" msgstr "%s Anonim olarak gönderildi" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Tarafından paylaşıldı %s saat %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "%s (%s) tarafından %s 'te paylaşılmıştır" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "%s tarafından %s 'te paylaşılmıştır" @@ -2720,11 +2815,11 @@ msgstr "" msgid "Previous" msgstr "Önceki" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2741,7 +2836,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Özel" @@ -2765,21 +2860,21 @@ msgstr "Problem %s onaylandı" msgid "Problem %s sent to council %s" msgstr "Problem %s kurula gönderildi %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Sorun devlet tarafından meydana gelmiştir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Problem çözülmemiş olarak işaretlenmiştir." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 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:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Sorunlar" @@ -2806,7 +2901,7 @@ msgstr "FixMyStreet'te kısa bir süre önce onarıldı olarak bildirilen proble msgid "Problems within %.1fkm of %s" msgstr "Konumun %.1fkm içerisinde yer alan sorunlar" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2832,7 +2927,8 @@ msgstr "" msgid "Property address:" msgstr "Emlak adresi:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Güncellemeye izin ver" @@ -2841,12 +2937,12 @@ msgstr "Güncellemeye izin ver" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "İsim ve şifre edinmek isteğe bağlıdır, fakat şifre almış olmanız durumunda sorunları bildirmek, güncellemeleri yapmak ve bildirimleri yönetmek daha kolay olacaktır." -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Şifre sağlamak isteğe bağlıdır, fakat şifre almış olmanız durumunda sorunları bildirmek, güncellemeleri yapmak ve bildirimleri yönetmek daha kolay olacaktır." @@ -2859,12 +2955,12 @@ msgstr "" msgid "Public response:" msgstr "Toplumsal geri bildirim:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Fotoğraf yayınla" @@ -2919,7 +3015,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:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2944,7 +3040,7 @@ msgstr "Bu problemin güncellemelerini RSS olarak besle" msgid "Receive email when updates are left on this problem." msgstr "Bu sorunda herhangi bir güncelleme olduğunda e-posta ile bildir." -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2958,7 +3054,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Yakın zamanda bildirilen problemler" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2982,9 +3078,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:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -2992,12 +3088,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Fotoğrafı kaldır (mümkün olmayabilir)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "" @@ -3026,11 +3126,11 @@ msgstr "Kötüye kullanım bildir" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "%s 'e bildir" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3045,17 +3145,17 @@ msgstr "Probleminizi bildirin" msgid "Report, view, or discuss local problems" msgstr "Yerel problemleri bildir, göster ve tartış" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "%s 'e ananim olarak bildirilmiş" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Önceden bildirilmiş" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "%s tarafından %s de bildirilmiştir" @@ -3069,27 +3169,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "%s kategorisine bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "%s kategorisine anonim olarak %s de bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr " %s tarafından %s kategorisinde %s de bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "%s aracılığıyla anonim olarak %s de bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "%s yoluyla %s tarafından %s da bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "%s aracılığıyla %s kategorisine anonim olarak %s de bildirilmiştir" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr " %s tarafından %s kategorisinde %s aracılığıyla %s 'e bildirilen raporlar" @@ -3098,8 +3198,8 @@ msgstr " %s tarafından %s kategorisinde %s aracılığıyla %s 'e bildirilen ra msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3107,10 +3207,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Bir problemin bildirilmesi" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Bildirimler" @@ -3127,7 +3226,7 @@ msgstr "Onay bekleyen bildirimler" msgid "Reports by destination" msgstr "%s tarafından %s de bildirilmiştir" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3139,7 +3238,7 @@ msgstr "" msgid "Reports published" msgstr "Yayınlanmış bildirimler" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3194,21 +3293,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3227,17 +3327,17 @@ 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:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Sola Yerleştir" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Sağa Yerleştir" @@ -3247,21 +3347,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "Uydu" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3272,12 +3372,12 @@ msgstr "Değişiklikleri kaydet" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3296,7 +3396,7 @@ msgstr "Bildirimleri ara" msgid "Search Users" msgstr "Kullanıcı Ara" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Bildirimleri ara" @@ -3307,6 +3407,7 @@ msgid "Search:" msgstr "Ara:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Aranan sonuç bulunamadı." @@ -3319,7 +3420,7 @@ msgstr "Arama sonucu kullanıcı bulunamadı" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3328,8 +3429,8 @@ msgstr "" msgid "Select a body" msgstr "Bir bölüm seç" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Bölge seç" @@ -3349,11 +3450,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "%s %s sonra gönder" @@ -3362,11 +3468,11 @@ msgid "Sent:" msgstr "gönderildi:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Hizmet:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3375,9 +3481,9 @@ msgid "Share" msgstr "Paylaş" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3385,19 +3491,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3405,40 +3511,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "İsmimi açıkça göster " -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Eskileri göster" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "İşaretlemeleri göster" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3449,12 +3552,16 @@ msgstr "Giriş yap" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Giriş yapın ve bir hesap oluşturun " -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Çıkış" @@ -3470,7 +3577,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "Son aşamaların bazıları API key FixMyStreet kurulumundan bildirimlerin geldiğine işaret etmektedir." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Son bildirimlerden bazı fotograflar" @@ -3483,15 +3590,19 @@ msgstr "Konumun belirlenebilmesi için tarif" 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." -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 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:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3524,20 +3635,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Başlangıç Tarihi:" #: templates/web/base/admin/body.html:73 @@ -3547,15 +3659,18 @@ msgstr "Başlangıç Tarihi:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Devlet" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Değişiklikleri kaydet" @@ -3569,17 +3684,19 @@ msgstr "Değişiklikleri kaydet" msgid "State:" msgstr "Devlet:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Devlet" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "İstatistik" @@ -3589,7 +3706,7 @@ msgstr "İstatistik" msgid "Status" msgstr "Durum" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Henüz çözülmemiş, anket aracılığıyla, %s" @@ -3602,7 +3719,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Alt kategori: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Alt kategori: %s" @@ -3619,18 +3741,19 @@ msgstr "Konu" msgid "Subject:" msgstr "Konu:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Kaydet" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3672,7 +3795,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3680,25 +3803,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Özet" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Özet bildirimler" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Özet bildirimler" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Anket Sonuçları" @@ -3706,14 +3835,14 @@ msgstr "Anket Sonuçları" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Metin" @@ -3721,7 +3850,7 @@ msgstr "Metin" msgid "Text only version" msgstr "Salt metin sürümü " -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3748,7 +3877,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Geri bildiriminiz için teşekkür ederiz" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Resim yüklediğiniz için teşekkür ederiz. Şİmsi sorunu konumlandırmak için lütfen yakındaki cadde ismini veya e :yukarıdaki kutucuktan postakodunu giriniz." @@ -3764,7 +3893,7 @@ msgstr "Bu şekilde resim doğru yüklemiş gibi görünmüyor (%s), lütfen tek 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." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "Konum İngiltere'de görünmüyor; lütfen tekrar deneyin." @@ -3774,11 +3903,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:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "Problem gönderildi olarak işaretlenmiştir." -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Bu problem yeniden gönderilecektir." @@ -3810,8 +3939,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3844,8 +3973,8 @@ msgstr "" 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:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Hata buydu: %s" @@ -3887,7 +4016,7 @@ msgstr "Kullanıcı tarafından halledilen sorunlar bildirildi" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "Kullanıcı tarafından bildirilen {{NAME}} sınırları içindeki en son sorunlar" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3912,7 +4041,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 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." @@ -3923,33 +4052,38 @@ msgid "" " Names are not necessarily unique." msgstr "Kullanıcının ismi anonim olan bildirimlerin arasında halka açık olarak görüntülenecektir. halka açık olması mutlaka isimlere özgü değildir." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "Gösterilecek hiçbir rapor yok." -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 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:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 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." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "E-posta ve şifre uyumu sorunu vardı. eğer şifrenizi hatırlamıyorsanız veya şifreniz yoksa lütfen formun email&rsquo tarafından ‘sign bölümünü doldurunuz. " - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "E-posta / şifrenizde bir sorun oluştu. Lütfen tekrar deneyiniz." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "E-posta ve şifre uyumu sorunu vardı. eğer şifrenizi hatırlamıyorsanız veya şifreniz yoksa lütfen formun email&rsquo tarafından ‘sign bölümünü doldurunuz. " + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Güncelleme esnasında bir hata oluştu. Lütfen tekrar deneyiniz." @@ -3957,7 +4091,7 @@ msgstr "Güncelleme esnasında bir hata oluştu. Lütfen tekrar deneyiniz." 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." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "Güncellemede bir hata oluştu. Lütfen aşağıya bakınız." @@ -4012,26 +4146,34 @@ msgid "" " 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:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Bu bilgi gereklidir" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "Burası gelişen bir sitedir, her an çökebilir ve veritabanı belli aralıklarla silinmektedir." +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4048,7 +4190,7 @@ msgstr "Bu problem giderilemedi" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4058,23 +4200,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Bu rapor işlenmeyi bekliyor." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Bu rapor şu an kapalı olarak işaretlenmiş." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Bu rapor şu an onarıldı olarak işaretlenmiş." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Bu rapor şu an açık olarak işaretlenmiş." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Bu bildirim anonim olarak " -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 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. " @@ -4085,7 +4227,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:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zaman çizelgesi" @@ -4097,20 +4239,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Başlık" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "senin için hazırladığımız yerel uyarıları bulmak için lütfen posta kodu veya cadde adı ve bölgeyi giriniz" @@ -4122,44 +4265,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "Bu konudaki kesin lokasyonu haritasını göstermek için" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Toplam" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Toplam" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4172,18 +4307,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Tekrar dene" @@ -4198,7 +4334,11 @@ msgstr "Direkt olarak e-posta gönderin:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4207,15 +4347,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Onaylanmamış" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Bilinmeyen" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Bilinmeyen uyarı tipi" @@ -4225,13 +4361,14 @@ msgstr "Bilinmeyen uyarı tipi" msgid "Unknown error" msgstr "Bilinmeyen hata" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Bilinmeyen ID problemi" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4256,12 +4393,12 @@ msgstr "Aşağıdaki anonim olarak %s 'e ekleneni güncelle" 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:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Bölümü güncelle" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Arızayı birim tarafından güncelle" @@ -4269,16 +4406,16 @@ msgstr "Arızayı birim tarafından güncelle" msgid "Update by {{name}}" msgstr "{{name}} göre güncelleme" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Değiştirilen problemin durumunu %s olarak güncelle" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "İşaretlenmiş problemi onarıldı olarak güncelle" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Tekrardan değerlendirilen problemi güncelle" @@ -4292,20 +4429,20 @@ msgstr "Güncelleme durumu" msgid "Updated" msgstr "Güncellendi" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "%s (%s) tarafından %s 'te paylaşılmıştır" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "%s tarafından %s 'te paylaşılmıştır" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4313,7 +4450,7 @@ msgid "Updated!" msgstr "Güncellendi!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Güncellemeler" @@ -4360,40 +4497,81 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "E-posta kara listeye eklendi" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "E-posta kara listede" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Kullanıcı etiketi kaldırıldı" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Kullanıcı etiketlendi" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "Gereksiz bölümüne atılsın mı?" #: templates/web/base/admin/users.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." -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Kullanıcılar" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Kullanıcılar" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Değerler güncellendi" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "E-posta adresin" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Telefon numaran" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4415,12 +4593,7 @@ msgstr "Bir konum görüntülemek" msgid "Viewing a problem" msgstr "Bir problemi görüntülemek" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4430,20 +4603,25 @@ msgstr "Bu kurulun ilgilendiği bölge" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "O bölgede birden fazla işaretlenmiş yer mevcut. On tane işaretlenmiş yer gösterilebilmektedir. Eğer sizinki bunlar arasında değilse, farklı şekilde arayın." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Üzgünüz, konum bulunamadı." -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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." @@ -4451,6 +4629,12 @@ msgstr "Bu problemin %s sorumluluğunda olduğunun farkındayız; ancak, şu and msgid "We send it to the council on your behalf" msgstr "Sizin adınıza kurula gönderiyoruz" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +msgstr "O bölgede birden fazla işaretlenmiş yer mevcut. On tane işaretlenmiş yer gösterilebilmektedir. Eğer sizinki bunlar arasında değilse, farklı şekilde arayın." + #: 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." @@ -4460,8 +4644,8 @@ msgstr "Kişisel bilgileriniz sadece bizim gizlilik politik msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "We’re problemin çözülemediği için üzgünüz. Yerel temsilcilere başvurmaya ne dersiniz?" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4489,7 +4673,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4512,6 +4696,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "kurum_sorumluluğunun birime gelen talepleri sınırlandırması mümkündür. Arama sözcüğü yönetim ID'si MaPit tarafından sağlanmaktadır." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "FixMyStreet'e katkıda bulunmak ister misin? Şifremiz herkese açıktır ve burdan ulaşılabilir fixmystreet.org." @@ -4528,16 +4716,7 @@ msgstr "Gönderdiğin bildiriminin kalıp halinde ve eksik noktalama işaretleri msgid "Wrong location? Just click again on the map." msgstr "Yanlış konum mu? Harita üzerine tekrardan tıklayın." -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Yıl" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4552,7 +4731,7 @@ msgstr "Yıl" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Evet" @@ -4565,7 +4744,7 @@ msgstr "Evet şifrem var" 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:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4582,7 +4761,7 @@ msgstr "Aşağıdaki kişisel bilgi veya benzeri kötü niyetli raporları içer 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:96 +#: templates/web/base/admin/user-form.html:114 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." @@ -4610,7 +4789,7 @@ 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:93 +#: templates/web/base/admin/body-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." @@ -4618,7 +4797,7 @@ msgstr "Eğer bir bölümü sitede aktif olarak bulunsun istemiyorsanız, silind msgid "You declined; please fill in the box above" msgstr "Kabul etmediniz; lütfen yukardaki kutuyu doldurun" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4645,18 +4824,38 @@ msgstr "Çıkış yaptınız" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Sorunun olduğu yeri harita üzerinde yeşil bir imge ile işaretlediniz. Eğer doğru yer değilse tekrar haritanın üzerine tıklayın." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "E-posta adresiniz başarıyla onaylandı." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "E-posta adresiniz başarıyla onaylandı." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "E-posta adresiniz başarıyla onaylandı." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "E-posta adresiniz başarıyla onaylandı." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Başarılı bir şekilde giriş yaptınız; lütfen bilgilerinizi kontrol edin ve onaylayın" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "E-posta adresiniz başarıyla onaylandı." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Henüz herhangi bir bildirim oluşturmadınız. Şimdi sorun olarak bir bildiri ." @@ -4680,36 +4879,43 @@ msgid "Your Reports" msgstr "Bildirimlerin" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "E-posta adresiniz" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "E-posta adresin" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +msgid "Your email or mobile" +msgstr "E-posta adresin" + #: 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" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4720,19 +4926,19 @@ msgstr "Adınız" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4743,8 +4949,8 @@ msgstr "Şifreniz" msgid "Your password has been changed" msgstr "Şifren değiştirildi" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Telefon numaran" @@ -4753,7 +4959,7 @@ msgstr "Telefon numaran" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Bildirimlerin" @@ -4762,25 +4968,40 @@ msgstr "Bildirimlerin" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Şifren değiştirildi" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Güncellemelerin" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4797,8 +5018,8 @@ msgstr "Kurul" msgid "didn't use map" msgstr "harita kullanılmamış" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "ör. ‘%s’ veya ‘%s’" @@ -4821,23 +5042,24 @@ msgstr "son güncelleme %s" msgid "less than a minute" msgstr "bir dakikadan az" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "n/a" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "Kurulun sorumluluğu dışında olarak işaretle" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "veya beni otomatik olarak bul" @@ -4878,7 +5100,7 @@ msgstr "Kullanıcı haritayı kullanmadığından herhangi bir işaret görünm msgid "this location" msgstr "Bir konum görüntülemek" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "bu tip lokal problem" @@ -4886,11 +5108,11 @@ msgstr "bu tip lokal problem" msgid "today" msgstr "bugün" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4898,14 +5120,24 @@ msgstr "" msgid "used map" msgstr "kullanılan harita" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "kullanıcının problemi - %d kuruldaki problemle aynı" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "kullanıcı problemin sahibi" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "E-posta kara listede" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "E-posta kara listeye eklendi" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4959,31 +5191,31 @@ msgid "%d year" msgid_plural "%d years" msgstr[0] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5043,6 +5275,39 @@ msgid "report" msgid_plural "reports" msgstr[0] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(E-posta kara listede)" + +#~ msgid "By Date" +#~ msgstr "Tarihe Göre" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "dd/mm/yyyy olarak girin ya da buraya tıklayın" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "%s ve %s arası onaylanmış raporlar" + +#~ msgid "Hide old" +#~ msgstr "Eskileri gizle" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Onaylanmamış bildirimleri dahil et" + +#~ msgid "Invalid end date" +#~ msgstr "Geçersiz bitiş tarihi" + +#~ msgid "Invalid start date" +#~ msgstr "Geçersiz başlangıç tarihi" + +#~ msgid "No council" +#~ msgstr "Kurul yok" + +#~ msgid "Show old" +#~ msgstr "Eskileri göster" + +#~ msgid "Year" +#~ msgstr "Yıl" + #~ msgid "%s ward, %s" #~ msgstr "%s bölüm, %s" @@ -5076,9 +5341,6 @@ msgstr[0] "" #~ msgid "No further action" #~ msgstr "Onarımı mümkün değil" -#~ msgid "Not Responsible" -#~ msgstr "Sorumlu değildir" - #~ msgid "Or problems reported to:" #~ msgstr "Veya 'e bildirilen sorunlar:" diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po index 1508c667dea..cadab664eed 100644 --- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Ukrainian (Ukraine) (https://www.transifex.com/mysociety/teams/12067/uk_UA/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "і" @@ -32,6 +32,10 @@ msgstr "і" msgid " or " msgstr "або" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr "%d редагувань від %s" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s контактів рад – %s підтверджених, %s непідтверджених" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -72,7 +76,7 @@ msgid "" msgstr "" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -83,6 +87,11 @@ msgstr "" msgid "%s live updates" msgstr "%s оперативних сповіщень" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s опитувань надіслано – на %s відповіли (%s%%)" @@ -91,7 +100,7 @@ msgstr "%s опитувань надіслано – на %s відпові msgid "%s ref: %s" msgstr "%s посилання: %s" -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "" @@ -99,11 +108,6 @@ msgstr "" msgid "(Defect & location of defect)" msgstr "" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "(поштова скринька в чорному списку)" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -139,7 +143,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(графіті, сміття, крива бруківка, проблеми з вуличним освітленням тощо)" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -160,8 +164,8 @@ msgstr "(відправлено обидвом)" msgid "(we also have RSS feeds for problems within %s)" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "-- Оберіть категорію --" @@ -174,14 +178,6 @@ msgstr "--Оберіть шаблон--" msgid "10 inch pothole on Example St, near post box" msgstr "Вибоїна 30 см на вул. Зеленій біля пошти." -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -193,16 +189,16 @@ msgstr "" " This is probably why \"area covered\" is empty (below).
\n" " Maybe add some MAPIT_TYPES to your config file?" -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 msgid " %s reports %s" msgstr "" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -211,33 +207,52 @@ msgstr "" msgid "%s live problems" msgstr "%s актуальні проблеми" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "Ні Я підтверджу сповіщення е-mail" -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "Ні Я підтверджу сповіщення е-mail" + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "Ні Я підтверджу поновлення е-mail" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "Ні Я підтверджу поновлення е-mail" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "Ні я залогінюсь через е-mail" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "Ні я залогінюсь через е-mail" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "Так В мене є пароль" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -251,11 +266,17 @@ msgid "Add a contact using the form below." msgstr "Додати контакт через форму нижче." #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Додати запис" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "Забанити адресу" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -278,11 +299,17 @@ msgstr "Додати нову категорію" msgid "Add option" msgstr "додатково" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "Додати до переліку" @@ -292,23 +319,23 @@ msgstr "Додати до переліку" msgid "Add user" msgstr "Додати користувача" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "Додати/редагувати категорію" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "Додати/редагувати пріоритет відповіді" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "Додати/редагувати шаблон відповіді" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "Додано %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -332,9 +359,10 @@ msgstr "Сповіщення %d відключено (створено %s)" msgid "Alert me to future updates" msgstr "Повідомляти мене про оновлення" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -343,12 +371,13 @@ msgstr "" msgid "All Reports" msgstr "Всі звіти" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "Всі звіти у форматі CSV" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "Всі Категорії" @@ -364,17 +393,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "Всі звіти" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "Всі звіти в проміжку з %s по %s" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -412,7 +441,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "Ви впевнені, що хочете скасувати завантаження?" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "Ви впевнені?" @@ -423,7 +453,7 @@ msgstr "Ви впевнені?" msgid "Area covered" msgstr "Зона покрита" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -437,7 +467,7 @@ msgid "Assign to competent body:" msgstr "Призначення компетентного органу:" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "Назначити іншу категорію:" @@ -449,7 +479,7 @@ msgstr "Назначити зовнішньому відділу:" msgid "Assign to subdivision:" msgstr "Назначити підрозділу:" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -465,12 +495,17 @@ 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:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "Автоматична відповідь:" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "Автоматична відповідь:" @@ -478,18 +513,10 @@ msgstr "Автоматична відповідь:" msgid "Available categories" msgstr "Доступні категорії" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "Уникайте особистої інформації та номерних знаків транспортних засобів" @@ -503,20 +530,21 @@ msgstr "Очікує перевірки модератором" msgid "Back" msgstr "Назад" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "Повернутися до всіх звітів" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "Забанити адресу" +#, fuzzy +msgid "Ban user" +msgstr "Відмітьте користувача" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "Органи" @@ -527,14 +555,10 @@ msgstr "Органи" msgid "Body" msgstr "Орган" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "Орган:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "По даті" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -547,8 +571,9 @@ msgstr "" msgid "Can't see the map? Skip this step" msgstr "Не бачите мапу? Пропустіть цей крок" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "Категорії" @@ -559,30 +584,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "Категорія" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "Категорія" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "Категорія змінена з ‘%s’ на ‘%s’" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "В цій категорії проблеми не вирішуються > 4 тижнів" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -590,17 +621,18 @@ msgstr "В цій категорії проблеми не вирішуютьс msgid "Category:" msgstr "Категорія:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "Категорія: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +#, fuzzy +msgid "Change" msgstr "Змінити пошту" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "Змінити адресу електронної пошти" @@ -608,10 +640,16 @@ msgstr "Змінити адресу електронної пошти" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "Змінити пароль" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(відсутній номер телефону)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -633,19 +671,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "Натисніть тут або введіть в форматі дд/мм/рррр" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Натисніть на точку на мапі щоб прозвітувати проблему" @@ -674,18 +707,19 @@ msgstr "Натисніть на посилання в надісланому е #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "Закрито" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "Закрито муніципалітетом" @@ -700,16 +734,17 @@ msgid "Cobrand" msgstr "Cobrand" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "Cobrand data:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "Cobrand:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -717,7 +752,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфігурація" @@ -726,7 +761,7 @@ msgstr "Конфігурація" msgid "Confirm" msgstr "Підтвердити" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "Підтвердити запис" @@ -745,14 +780,10 @@ msgstr "Підтвердження" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "Підтверджено" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "Підтверджені звіти з %s по %s" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -779,8 +810,8 @@ msgstr "Звернутись до команди" msgid "Coordinates:" msgstr "Координати:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "Не вдалось знайти користувача" @@ -798,43 +829,16 @@ msgstr "Рада" msgid "Council contacts for %s" msgstr "Контакти ради для %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "рада ref: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "Рада:" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "Число" @@ -856,40 +860,45 @@ msgstr "Створити категорію" msgid "Create priority" msgstr "Створити приоритет" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 #, fuzzy msgid "Create reports/updates as anonymous user" msgstr "Створити звіт/оновлення для ради" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "Створити звіт/оновлення для ради" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "Створити шаблон" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "Створено" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "Створено:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "Поточний стан" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -900,14 +909,14 @@ msgstr "Наразі жодних органів не було створено" msgid "Customer not contactable" msgstr "" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "Дашборд" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Dealt with by subdivision within 5 working days" @@ -920,12 +929,12 @@ msgstr "" msgid "Default priority" msgstr "Створити приоритет" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "Видалити шаблон" @@ -936,8 +945,8 @@ msgstr "Видалити шаблон" msgid "Deleted" msgstr "Видалено" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -953,6 +962,10 @@ msgstr "Опис" msgid "Description:" msgstr "Опис:" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -965,6 +978,10 @@ msgstr "Подробиці" msgid "Details:" msgstr "Подробиці:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "Передано" @@ -978,8 +995,8 @@ msgstr "Не використовувати карту" msgid "Diligency prize league table" msgstr "Таблиця найстаранніших призерів" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -988,7 +1005,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "Не відправляти листи автору про нові коментарі" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -996,7 +1013,7 @@ msgstr "Не відправляти листи автору про нові ко msgid "Do you have a %s password?" msgstr "" -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1016,11 +1033,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "Перетягніть фотографії сюди чи натисніть для завантаження" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1040,9 +1057,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "Редагувати" @@ -1052,33 +1070,33 @@ msgstr "Редагувати" msgid "Edit body details" msgstr "Редагувати дані про орган" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "Редагувати інші подробиці про користувача" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "Редагувати права користувача" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "Редагувати звіт" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "Редагуємо проблему %d" @@ -1099,7 +1117,6 @@ msgstr "Редактор" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1107,17 +1124,20 @@ msgstr "Редактор" msgid "Email" msgstr "Е-пошта" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "Пошта занесена в чорний список" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "Адреса електронної пошти" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "Адреса електронної пошти" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "Email оповіщення створено" @@ -1126,19 +1146,18 @@ msgstr "Email оповіщення створено" msgid "Email alert deleted" msgstr "Email Оповіщення видалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "Адреса вже в чорному списку" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "Е-пошта:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "Е-пошта: %s" @@ -1151,16 +1170,17 @@ msgid "" " this article." msgstr "" +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "Кінцева дата:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1181,14 +1201,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "Введіть найближчу поштову адресу, або назву вулиці чи району" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "Введіть назву вулиці чи району поблизу" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "Введіть пароль" @@ -1206,8 +1226,8 @@ msgstr "Введіть подробиці проблеми" msgid "Error" msgstr "Помилка" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "Всі" @@ -1232,7 +1252,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "Поясніть чому неправильно" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1248,7 +1268,7 @@ msgstr "Зовнішній" msgid "External ID" msgstr "Зовнішній ID" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "Зовнішнє посилання" @@ -1260,7 +1280,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1272,7 +1292,7 @@ msgstr "Подробиці" msgid "Extra data:" msgstr "Додаткові дані:" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "Подробиці" @@ -1302,21 +1322,22 @@ msgstr "Полагодіть це вибравши зону покрит #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "Вирішено" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "Вирішено - Рада" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "Вирішено - Користувач" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "Відмітьте як видалене" @@ -1324,7 +1345,7 @@ msgstr "Відмітьте як видалене" msgid "Flag user" msgstr "Відмітьте користувача" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "Відмічено" @@ -1333,7 +1354,7 @@ msgstr "Відмічено" msgid "Flagged reports and users" msgstr "Відмічені звіти та користувачі" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "Відмічені користувачі виписані на відміченій сторінці." @@ -1341,8 +1362,8 @@ msgstr "Відмічені користувачі виписані на How FixMyStreet uses Mapit." msgstr "For more information, see How FixMyStreet uses Mapit." -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1382,8 +1403,12 @@ msgstr "" msgid "Frequently Asked Questions" msgstr "Часто задавані питання" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1416,12 +1441,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "Вперед" @@ -1429,7 +1454,7 @@ msgstr "Вперед" msgid "Going to send questionnaire?" msgstr "Збираєтесь відправити опитувальник?" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "Надання адміністративного доступу" @@ -1437,6 +1462,15 @@ msgstr "Надання адміністративного доступу" msgid "Graph of problem creation by status over time" msgstr "Графік створення проблем з часом" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "від %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "Проблему було вирішено?" @@ -1457,21 +1491,26 @@ msgstr "Допомога" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "Фотографії найближчих сповіщень" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Вітаємо, %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "Прихований" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1492,21 +1531,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "Приховати застарілі" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "Приховати привязки" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1518,7 +1554,7 @@ msgstr "" msgid "History" msgstr "Історія" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "Домашня" @@ -1577,6 +1613,10 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1585,6 +1625,10 @@ msgstr "" "Якщо два чи більше органи обслуговують певний регіон, сервіс сполучає ідентичні категорії в один запис\n" " в меню. Переконайтесь, що ви використовуєте однакові назви категорій якщо хочете, щоб це сталось." +#: templates/web/base/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "Якщо ви отримаєте більше інформації про стан вашої проблеми, будь ласка, поверніться на сайт і залиште оновлення." @@ -1593,7 +1637,7 @@ msgstr "Якщо ви отримаєте більше інформації пр 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1602,7 +1646,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1674,11 +1718,7 @@ msgstr "" msgid "Include reporter personal details" msgstr "Додати особисті дані автора сповіщення" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "Включити непідтверджені сповіщення" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "Невірне значення has_photo \"%s\"" @@ -1690,7 +1730,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1702,26 +1742,18 @@ msgstr "Внутрішні нотатки" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "Невірне значення agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "Невірна кінцева дата" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "Невірний формат %s ." -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "Невірна початкова дата" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "" @@ -1740,7 +1772,7 @@ msgstr "" msgid "Jurisdiction unknown" msgstr "" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1765,12 +1797,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1796,18 +1823,14 @@ msgstr "Останнє поновлення:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")." -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1816,13 +1839,13 @@ msgstr "" msgid "List all reported problems" msgstr "Показати всі прозвітовані проблеми" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "Завантаження..." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1854,12 +1877,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1867,11 +1893,11 @@ msgstr "" msgid "MAP" msgstr "Мапа" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1883,11 +1909,11 @@ msgstr "" msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "Позначте користувачів, чию поведінку ви хочете відстежувати прапорцем." -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1907,45 +1933,45 @@ msgstr "" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "Бракує jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "Модерується підрозділом на протязі робочого дня" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "Місяць" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -1963,9 +1989,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -1976,19 +2002,24 @@ msgstr "Ім'я" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "Ім'я:" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "Ім'я: %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +#, fuzzy +msgid "Nearest calculated address:" +msgstr "Нова адреса електронної пошти:" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -1998,12 +2029,12 @@ msgstr "Найближча дорога до шпильки на карті (а msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Найближчий поштовий індекс до шпильки на карті (автоматично згенеровано): %s (відстань: %sм)" -#: perllib/FixMyStreet/Cobrand/Default.pm:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Найближча дорога до шпильки на карті (автоматично згенеровано через Bing карти): %s%s" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2019,19 +2050,23 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "" +#: templates/web/base/auth/smsform.html:19 +msgid "Nearly done! Now check your phone…" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "Новий орган додано" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "Новий контакт категорії додано" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "Нова адреса електронної пошти:" @@ -2052,6 +2087,11 @@ msgstr "" msgid "New password:" msgstr "Новий пароль:" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(відсутній номер телефону)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2081,18 +2121,19 @@ msgstr "Нові проблеми в межах {{NAME}}" msgid "New reports" msgstr "Нові сповіщення" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "Новий стан" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "Новий шаблон" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2100,7 +2141,7 @@ msgstr "" msgid "Next" msgstr "Далі" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2112,22 +2153,18 @@ msgstr "Далі" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "Ні" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "Без органу" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "Без департаменту" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "Не вибраний департамент" @@ -2157,6 +2194,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "Ніякого результату не повернено" @@ -2179,15 +2220,15 @@ msgstr "Ніхто не підтримав" msgid "None" msgstr "Нічого" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2206,7 +2247,7 @@ msgstr "" msgid "Not for my subdivision" msgstr "Не мій підрозділ" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "Не прозвітовано раніше" @@ -2220,10 +2261,6 @@ msgstr "Не прозвітовано департаменту" msgid "Note" msgstr "Нотатка" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "Зауважте, коли включаєм непідтвердженне сповіщення ми використовуєм дату створення сповіщення. Вона може відрізнятись від дати підтвердження сповіщення, тому цифри в датах можуть трошки стрибати." - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2251,37 +2288,46 @@ msgstr "Тепер відправити ваше сповіщення …" msgid "Now to submit your update…" msgstr "Тепер щоб відправити ваше поновлення…" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "Гаразд" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "Застарілий стан" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2321,23 +2367,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "Інше" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "інші зони:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2355,19 +2408,19 @@ msgstr "Сторінку не знайдено" msgid "Parent" msgstr "Предок" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "Частково" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "Пароль (опціонально)" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "Пароль:" @@ -2375,7 +2428,7 @@ msgstr "Пароль:" msgid "Permalink" msgstr "Постійне посилання" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "Дозволи:" @@ -2383,19 +2436,24 @@ msgstr "Дозволи:" msgid "Phone Reporter:" msgstr "" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "Номер телефону" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "Номер телефону (опціонально)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +msgid "Phone verified:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "Телефон:" @@ -2411,7 +2469,7 @@ msgstr "Телефон:" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2437,12 +2495,17 @@ msgstr "Фотографія" msgid "Photos of recent nearby reports" msgstr "Фотографії найближчих сповіщень" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "Розмістіть шпильку на карті" @@ -2464,25 +2527,34 @@ msgstr "Будь ласка будьте ввічливим, виразним і msgid "Please check the passwords and try again" msgstr "Будь ласка перевірте пароль і спробуйте ще раз" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "Будь ласка перевірте чи ваша адреса е-пошти вірна" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "Будь ласка перевірте чи ваша адреса е-пошти вірна" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "Будь ласка оберіть категорію" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "Будь ласка, виправте помилки" @@ -2497,39 +2569,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Будь ласка не використовуйте образи — ображаючи департамент ві підриваєте цінність сервісу для всіх користувачів" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "Будь ласка введіть повідомлення" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "Будь ласка введіть номер телефону" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "Будь ласка, введіть ім'я " -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "Будь ласка введіть пароль" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "Будь ласка вкажіть тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "Будь ласка введіть правильну адресу е-пошти" @@ -2538,55 +2618,62 @@ msgstr "Будь ласка введіть правильну адресу е-п msgid "Please enter a valid email address" msgstr "Будь ласка введіть правильну адресу е-пошти" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "Будь ласка введіть номер телефону" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "Будь ласка додайте трохи подробиць" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "Будь ласка вкажіть е-пошту" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "Будь ласка вкажіть адресу е-пошти" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "Будь ласка введіть ім'я" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "Будь ласка введіть ім'я" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "Будь ласка введіть номер телефону" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "Будь ласка введіть прізвище" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "Будь ласка вкажіть заголовок" @@ -2635,7 +2722,12 @@ msgstr "" msgid "Please note:" msgstr "Будь ласка зауважте:" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "Будь ласка, оприлюдніть оновлений звіт." + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "Будь ласка, оприлюдніть оновлений звіт." @@ -2675,6 +2767,11 @@ msgstr "Будь ласка вкажіть чи була вирішена про msgid "Please upload an image only" msgstr "Будь ласка, завантажте тільки зображення" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "Будь ласка напишіть повідомлення" @@ -2684,7 +2781,7 @@ msgid "Please write your update here" msgstr "Будь ласка напишіть поновлення" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "Допис" @@ -2693,15 +2790,15 @@ msgstr "Допис" msgid "Posted anonymously at %s" msgstr "Опубліковано анонімно в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "Опубліковано %s в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "Опубліковано %s (%s) в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "Опубліковано %s в %s" @@ -2713,11 +2810,11 @@ msgstr "" msgid "Previous" msgstr "Попередній" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2734,7 +2831,7 @@ msgstr "" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "Приватний" @@ -2758,21 +2855,21 @@ msgstr "Проблема %s підтверджена" msgid "Problem %s sent to council %s" msgstr "Проблему %s надіслано департаменту %s" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Розбивка проблем по стану" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "Проблема маркована відкритою." -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "Стан проблеми змінено базуючись на результатах опитувань" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "Проблеми" @@ -2799,7 +2896,7 @@ msgstr "Нещодавно вирішені проблеми" msgid "Problems within %.1fkm of %s" msgstr "Проблеми в радіусі %.1fkm від цієї точки" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2825,7 +2922,8 @@ msgstr "" msgid "Property address:" msgstr "Адреса майна:" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "Надішліть оновлення" @@ -2834,12 +2932,12 @@ msgstr "Надішліть оновлення" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Вказання імені і паролю не обов'язкове, проте це дозволить вам більш легко сповіщати про проблеми, залишати поновлення та керувати вашими сповіщеннями" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "Вказання паролю не обов'язкове, проте це дозволить вам більш легко сповіщати про проблеми, залишати поновлення та керувати вашими сповіщеннями" @@ -2852,12 +2950,12 @@ msgstr "" msgid "Public response:" msgstr "Публічна відповідь:" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "Публічне фото" @@ -2912,7 +3010,7 @@ msgstr "" msgid "RSS feed of nearby problems" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2937,7 +3035,7 @@ msgstr "RSS стрічка з оновленнями по цій проблем msgid "Receive email when updates are left on this problem." msgstr "Отримувати листа коли інформація по проблемі буде оновлена" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -2951,7 +3049,7 @@ msgstr "" msgid "Recently reported problems" msgstr "Нещодавно перевідкриті проблеми" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -2975,9 +3073,9 @@ msgstr "Зняти прапорець" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "Видалити з переліку" @@ -2985,12 +3083,16 @@ msgstr "Видалити з переліку" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Видалити фото (це незворотня операція!)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "Відповісти " @@ -3019,11 +3121,11 @@ msgstr "Поскаржитись" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "Звіт по %s" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3038,17 +3140,17 @@ msgstr "Опишіть проблему" msgid "Report, view, or discuss local problems" msgstr "Сповіщайте, переглядайте, або обговорюйте місцеві проблеми" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "Сповіщено анонімно по %s" -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "Сповіщено раніше" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "Перевідкрито %s о %s" @@ -3062,27 +3164,27 @@ msgstr "" msgid "Reported in the %s category" msgstr "Сповіщено в категорії %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Сповіщено в категорії %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "Сповіщено в категорію %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "Сповіщено %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "Сповіщено через %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сповіщено через %s в категорію %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сповіщено через %s в категорію %s %s о %s" @@ -3091,8 +3193,8 @@ msgstr "Сповіщено через %s в категорію %s %s о %s" msgid "Reported:" msgstr "" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3100,10 +3202,9 @@ msgstr "" msgid "Reporting a problem" msgstr "Сповістити про проблему" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "Сповіщення" @@ -3120,7 +3221,7 @@ msgstr "Сповіщення очікують підтвердження" msgid "Reports by destination" msgstr "Перевідкрито %s о %s" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3132,7 +3233,7 @@ msgstr "" msgid "Reports published" msgstr "Сповіщення опубліковано" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3188,21 +3289,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3221,17 +3323,17 @@ msgstr "Обслуговувач цієї дороги (отримано з до msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Обслуговувач цієї дороги (з OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "Повернули вліво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "Повернути вправо" @@ -3241,21 +3343,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3266,12 +3368,12 @@ msgstr "Зберети зміни" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3290,7 +3392,7 @@ msgstr "Пошук сповіщень" msgid "Search Users" msgstr "Пошук користувачів" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "Пошук сповіщень" @@ -3301,6 +3403,7 @@ msgid "Search:" msgstr "Пошук:" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "Пошук не знайшов сповіщень." @@ -3313,7 +3416,7 @@ msgstr "Пошук не знайшов користувачів." msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3322,8 +3425,8 @@ msgstr "" msgid "Select a body" msgstr "Оберіть орган" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "Оберіть район" @@ -3343,11 +3446,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "Відправити %s %s пізніше" @@ -3356,11 +3464,11 @@ msgid "Sent:" msgstr "Надіслано:" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "Сервіс:" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "Визначити поточні координати" @@ -3369,9 +3477,9 @@ msgid "Share" msgstr "Поширити" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "Перелік" @@ -3379,19 +3487,19 @@ msgstr "Перелік" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3399,40 +3507,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "Показувати моє ім'я публічно" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "Показувати старі" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "Показувати шпильки" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3443,12 +3548,16 @@ msgstr "Увійти" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "Увійти або створити обліковий запис" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "Вийти" @@ -3464,7 +3573,7 @@ msgid "" " sent from your FixMyStreet installation." msgstr "" -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Деякі фото нещодавніх проблем" @@ -3477,15 +3586,19 @@ msgstr "Певний текст для локалізації" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "" +#: templates/web/base/auth/smsform.html:16 +msgid "Sorry, that wasn’t the correct code" +msgstr "" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "Вибачте, сталася помилка" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3518,20 +3631,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "Початкова дата:" #: templates/web/base/admin/body.html:73 @@ -3541,15 +3655,18 @@ msgstr "Початкова дата:" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "Стан" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "Зберети зміни" @@ -3563,17 +3680,19 @@ msgstr "Зберети зміни" msgid "State:" msgstr "Стан:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "Стан" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "Статистика" @@ -3583,7 +3702,7 @@ msgstr "Статистика" msgid "Status" msgstr "Статус" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr "Все ще відкрито, через анкету, %s" @@ -3596,7 +3715,12 @@ msgstr "" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "Підкатегорія: %s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "Підкатегорія: %s" @@ -3613,18 +3737,19 @@ msgstr "Тема" msgid "Subject:" msgstr "Тема:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "Підтвердити" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3666,7 +3791,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3674,25 +3799,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "Резюме" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "Сумарні сповіщення" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "Сумарні сповіщення" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "Результати опитування" @@ -3700,14 +3831,14 @@ msgstr "Результати опитування" msgid "Template «%s»" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "Шаблони" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "Текст" @@ -3715,7 +3846,7 @@ msgstr "Текст" msgid "Text only version" msgstr "Лише текстова версія" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3742,7 +3873,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "Дякуємо за відповідь." -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "Дякуємо за надіслане фото. Тепер нам потрібно визначити місце проблеми, тому будь ласка введіть назву вулиці поблизу чи поштовий код в полі вище  :" @@ -3758,7 +3889,7 @@ msgstr "Під час завантаження фото трапилась по msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Це місце не підпорядковане Чернівцям; можливо воно знаходиться за його межами? Спробуйте ще раз." -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "" @@ -3768,11 +3899,11 @@ msgstr "" msgid "That postcode was not recognised, sorry." msgstr "Поштовий код не розпізнано, вибачте." -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "Цю проблему зараз перезвітують." @@ -3808,8 +3939,8 @@ msgid "" " 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/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3842,8 +3973,8 @@ msgstr "Департамент не зможе допомгти доки інф msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "Трапилась помилка: %s" @@ -3885,7 +4016,7 @@ msgstr "Останні локальні проблеми, які користу msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "" @@ -3910,7 +4041,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Користувач не зміг позначити проблему на карті, тільки введену зону" @@ -3923,33 +4054,38 @@ msgstr "" "Користувацьке ім'я відображаються публічно на сповіщеннях, які не відмічені анонімними.\n" " Імена не обов'язково мають бути унікальними." -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Сталась проблема з відображенням сторінки всіх сповіщень. Спробуйте пізніше." #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "Сталась помилка при спробі показати сторінку. Будь ласка спробуйте пізніше." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "З комбінацією поштової адреси і паролю щось не так. Якщо ви не в змозі пригадати пароль або у вас його немає, заповніть секцію ‘увійти поштою’" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "Сталась проблема з вашою комбінацією адреси пошти і паролю. Будь ласка спробуйте пізніше." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "З комбінацією поштової адреси і паролю щось не так. Якщо ви не в змозі пригадати пароль або у вас його немає, заповніть секцію ‘увійти поштою’" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "Сталась проблема з поновленням. Будь ласка спробуйте ще раз." @@ -3957,7 +4093,7 @@ msgstr "Сталась проблема з поновленням. Будь ла msgid "There were problems with your report. Please see below." msgstr "Зі сповіщенням є негаразди. Гляньте нижче." -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "З поновленням щось негаразд. Гляньте нижче." @@ -4012,26 +4148,34 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "Ця інформація обов'язкова" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4048,7 +4192,7 @@ msgstr "Цю проблему не вирішено" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4058,23 +4202,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "Це сповіщення очікує модерації." -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "Це сповіщення наразі відмічено закритим." -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "Це сповіщення наразі відмічено вирішеним." -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "Це сповіщення відмічено відкритим." -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "Це сповіщення надіслано анонімно" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Ця веб-сторінка також містить фото проблеми, які надав користувач." @@ -4085,7 +4229,7 @@ msgstr "Ця веб-сторінка також містить фото проб msgid "Time spent (in minutes):" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Хронологія" @@ -4097,20 +4241,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "Заголовок" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "Назва:" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Щоб дізнатись які локальні алярми ми маєм для вас, введіть ваш поштовий код, назву вулиці та район" @@ -4122,44 +4267,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "До перегляду точного місцезнаходження проблеми на карті" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" -msgstr "" - -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "Загалом" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "Загалом" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4172,18 +4309,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "Спробуйте ще раз" @@ -4198,7 +4336,11 @@ msgstr "" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4207,15 +4349,11 @@ msgstr "" msgid "Unconfirmed" msgstr "Не підтверджено" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "Невідомо" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "Невідомий тип алярму" @@ -4225,13 +4363,14 @@ msgstr "Невідомий тип алярму" msgid "Unknown error" msgstr "Невідома помилка" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "Невідомий ідентифікатор проблеми" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4256,12 +4395,12 @@ msgstr "Поновлення додано анонімно о %s" msgid "Update below added by %s at %s" msgstr "Поновлення нижче додано %s о %s" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Поновити орган" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "Оновити розбивку за станом" @@ -4269,16 +4408,16 @@ msgstr "Оновити розбивку за станом" msgid "Update by {{name}}" msgstr "Поновлення від {{name}}" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "Поновлення змінило стан проблеми в %s" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "Поновлення відмітило проблему як вирішену" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "Поновлення перевідкрило проблему" @@ -4292,20 +4431,20 @@ msgstr "Поновити статуси" msgid "Updated" msgstr "Поновлено" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "Опубліковано %s (%s) в %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "Опубліковано %s в %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4313,7 +4452,7 @@ msgid "Updated!" msgstr "Поновлено!" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "Поновлення" @@ -4360,40 +4499,81 @@ msgstr "" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "Пошта занесена в чорний список" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "Адреса вже в чорному списку" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "Користувацький прапорець видалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "Користувач відмічений" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "В чорний список?" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "Пошук користувачів знайшов співпадіння в іменах та поштових адресах" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "Користувачі" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "Користувачі" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "Значення оновлено" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "Нова адреса електронної пошти:" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "Ваш телефон" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4415,12 +4595,7 @@ msgstr "Переглядаєм локацію" msgid "Viewing a problem" msgstr "Переглядаєм проблему" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4430,20 +4605,25 @@ msgstr "Райони рад" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "Ми знайшли більше одного співпадіння для цієї локації. Ми показуєм до десяти співпадінь, будь ласка спробуйте задати пошук інакше, якщо вашого місця тут немає." +#, fuzzy +msgid "We found more than one match for that location." +msgstr "Вибачте, ми не знайшли це місце" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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; нажаль, наразі у нас немає їх контактних даних. Якщо ви знаєте точну адресу, будь ласка залишайтесь на зв'язку." @@ -4451,6 +4631,12 @@ msgstr "Ми розумієм, що проблема може лежати у в msgid "We send it to the council on your behalf" msgstr "Ми надіслали це відповідному департаменту від вашого імені" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4460,8 +4646,8 @@ msgstr "Ми будем використовувати ваші персонал msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4489,7 +4675,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4512,6 +4698,10 @@ msgstr "" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "" +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "" @@ -4528,16 +4718,7 @@ msgstr "Повідомлення, написане суцільними вели msgid "Wrong location? Just click again on the map." msgstr "" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "Рік" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4552,7 +4733,7 @@ msgstr "Рік" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "Так" @@ -4565,7 +4746,7 @@ msgstr "Так, в мене є пароль" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4582,7 +4763,7 @@ msgstr "You are reporting the following update for being abusive, containing per msgid "You can view the problem on this site." msgstr "Ви можете переглянути проблему на цьому сайті." -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 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." @@ -4608,7 +4789,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -4616,7 +4797,7 @@ msgstr "" msgid "You declined; please fill in the box above" msgstr "Ви відхилили. Будь ласка заповніть форму вище" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4643,18 +4824,38 @@ msgstr "Ви успішно вийшли." msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Ви позначили проблему зеленою шпилькою на мапі. Якщо ця локація не вірна - просто клацніть на мапу ще раз." -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "Ви успішно підтвердили поштову адресу." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "Ви успішно підтвердили поштову адресу." +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "Ви успішно підтвердили поштову адресу." + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "Ви успішно підтвердили поштову адресу." + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "Ви успішно увійшли; будь ласка перевірте чи деталі вірні:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "Ви успішно підтвердили поштову адресу." + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "Ви не сповістили про жодну проблему. Сповістіть про проблему" @@ -4681,36 +4882,43 @@ msgid "Your Reports" msgstr "Ваші сповіщення" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "Ваша пошта" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "Ваша адреса е-пошти" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +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 "Ваша інформація буде використана згідно політики конфіденційності" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4721,19 +4929,19 @@ msgstr "Ваше ім'я" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4744,8 +4952,8 @@ msgstr "Ваш пароль" msgid "Your password has been changed" msgstr "Ваш пароль було змінено" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "Ваш телефон" @@ -4754,7 +4962,7 @@ msgstr "Ваш телефон" msgid "Your report" msgstr "Ваш звіт" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "Ваші сповіщення" @@ -4763,25 +4971,40 @@ msgstr "Ваші сповіщення" msgid "Your shortlist" msgstr "Ваш перелік" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "Ваш пароль було змінено" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "Ваші поновлення" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "всі" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4798,8 +5021,8 @@ msgstr "рада" msgid "didn't use map" msgstr "не використовував карту" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "наприклад ‘%s’ чи ‘%s’" @@ -4822,23 +5045,24 @@ msgstr "останнє поновлення %s" msgid "less than a minute" msgstr "менше хвилини" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "недоступно" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "позначено як не відповідальність ради" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "або знайти мене автоматично" @@ -4879,7 +5103,7 @@ msgstr "шпильки немає так як користувач не вико msgid "this location" msgstr "Переглядаєм локацію" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "цей тип локальної проблеми" @@ -4887,11 +5111,11 @@ msgstr "цей тип локальної проблеми" msgid "today" msgstr "сьогодні" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4899,14 +5123,24 @@ msgstr "" msgid "used map" msgstr "викроистана мапа" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "користувач з тієї ж ради що й проблема - %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "користувач є власником проблеми" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "Адреса вже в чорному списку" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "Видалити з переліку" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -4976,7 +5210,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" @@ -4984,7 +5218,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" @@ -4992,7 +5226,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" @@ -5000,7 +5234,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" @@ -5008,7 +5242,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5088,6 +5322,42 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "(поштова скринька в чорному списку)" + +#~ msgid "By Date" +#~ msgstr "По даті" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "Натисніть тут або введіть в форматі дд/мм/рррр" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "Підтверджені звіти з %s по %s" + +#~ msgid "Hide old" +#~ msgstr "Приховати застарілі" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "Включити непідтверджені сповіщення" + +#~ msgid "Invalid end date" +#~ msgstr "Невірна кінцева дата" + +#~ msgid "Invalid start date" +#~ msgstr "Невірна початкова дата" + +#~ msgid "No council" +#~ msgstr "Без департаменту" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "Зауважте, коли включаєм непідтвердженне сповіщення ми використовуєм дату створення сповіщення. Вона може відрізнятись від дати підтвердження сповіщення, тому цифри в датах можуть трошки стрибати." + +#~ msgid "Show old" +#~ msgstr "Показувати старі" + +#~ msgid "Year" +#~ msgstr "Рік" + #~ msgid "%s ward, %s" #~ msgstr "%s район, %s" diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po index 2674f896041..db66db0cea9 100644 --- a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 1.0\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2017-09-13 15:40+0100\n" +"POT-Creation-Date: 2017-12-15 17:48+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: mySociety , 2017\n" "Language-Team: Chinese (https://www.transifex.com/mysociety/teams/12067/zh/)\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:632 -#: perllib/FixMyStreet/Script/Reports.pm:197 +#: perllib/FixMyStreet/DB/Result/Problem.pm:650 +#: perllib/FixMyStreet/Script/Reports.pm:196 msgid " and " msgstr "與" @@ -32,6 +32,10 @@ msgstr "與" msgid " or " msgstr "或" +#: templates/web/base/report/_inspect.html:152 +msgid "%d characters maximum" +msgstr "" + #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" msgstr " 由 %d 編輯 %d" @@ -64,7 +68,7 @@ msgid "%s council contacts – %s confirmed, %s unconfirmed" msgstr "%s 地方政府承辦人員 – %s 確認 %s 尚未確認" #. ("%s is the site name") -#: templates/web/base/alert/index.html:7 +#: templates/web/base/alert/index.html:8 msgid "" "%s has a variety of RSS feeds and email alerts for local\n" "problems, including alerts for all problems within a particular ward, or all\n" @@ -75,7 +79,7 @@ msgstr "" "或是某一範圍內各類問題的通知" #. ("%s is the site name") -#: templates/web/base/alert/index.html:11 +#: templates/web/base/alert/index.html:12 msgid "" "%s has a variety of RSS feeds and email alerts for local problems, including\n" "alerts for all problems within a particular ward or council, or all problems\n" @@ -89,6 +93,11 @@ msgstr "" msgid "%s live updates" msgstr "%s 現場更新" +#: templates/web/base/dashboard/index.html:159 +#: templates/web/base/dashboard/index.html:163 +msgid "%s opened, %s closed, %s fixed" +msgstr "" + #: templates/web/base/status/stats.html:25 msgid "%s questionnaires sent – %s answered (%s%%)" msgstr "%s 問卷送出 – % 回覆(%s%%)" @@ -97,7 +106,7 @@ msgstr "%s 問卷送出 – % 回覆(%s%%)" msgid "%s ref: %s" msgstr "%s 流水號: %s " -#: perllib/FixMyStreet/Map/OSM.pm:38 +#: perllib/FixMyStreet/Map/OSM.pm:44 msgid "© OpenStreetMap contributors" msgstr "版本; OpenStreetMap開放街道地圖 貢獻者" @@ -105,11 +114,6 @@ msgstr "版本; OpenStreetMap msgid "(Defect & location of defect)" msgstr "(缺陷 & 缺陷地點)" -#: templates/web/base/admin/report_blocks.html:18 -#: templates/web/base/admin/users.html:32 -msgid "(Email in abuse table)" -msgstr "電郵為濫發信件" - #: templates/web/zurich/admin/report_edit-sdm.html:62 #: templates/web/zurich/admin/report_edit.html:90 msgid "(No name)" @@ -145,7 +149,7 @@ msgstr "" msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(例如塗鴉, 文宣張貼, 人行道鋪板或街燈損壤, )" -#: templates/web/base/reports/index.html:69 +#: templates/web/base/reports/index.html:82 msgid "(no longer exists)" msgstr "" @@ -167,8 +171,8 @@ msgstr "兩個都送出" msgid "(we also have RSS feeds for problems within %s)" msgstr "在 %s 內之問題RSS 訂閱" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:245 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:674 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:252 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:688 #: perllib/FixMyStreet/DB/Result/Problem.pm:381 msgid "-- Pick a category --" msgstr "選擇分類" @@ -181,14 +185,6 @@ msgstr "" msgid "10 inch pothole on Example St, near post box" msgstr "" -#: templates/web/base/dashboard/index.html:153 -msgid "14-30 days old" -msgstr "" - -#: templates/web/base/dashboard/index.html:152 -msgid "7-14 days old" -msgstr "" - #: templates/web/base/admin/body-form.html:50 #: templates/web/base/admin/body-form.html:51 msgid "" @@ -202,17 +198,17 @@ msgstr "" "\n" "可以在你的設定檔加入一些 地圖連結別 " -#: templates/web/base/dashboard/index.html:15 +#: templates/web/base/dashboard/index.html:18 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:48 +#: templates/web/base/reports/_list-filters.html:56 #, fuzzy msgid " %s reports %s" msgstr " %s %s" -#: templates/web/base/js/translation_strings.html:74 +#: templates/web/base/js/translation_strings.html:78 msgid "%s saved." msgstr "" @@ -221,33 +217,52 @@ msgstr "" msgid "%s live problems" msgstr "%s 現場問題" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my report by email" msgstr "不 我要利用電子郵件確認我的申報 " -#: templates/web/base/report/update/form_user_loggedout_by_email.html:2 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my report by email/text" +msgstr "不 我要利用電子郵件確認我的申報 " + +#: templates/web/base/report/update/form_user_loggedout_by_email.html:5 msgid "No Let me confirm my update by email" msgstr "不 我要用電子郵件收到更新通知" -#: templates/web/base/auth/general.html:106 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:3 +#, fuzzy +msgid "No Let me confirm my update by email/text" +msgstr "不 我要用電子郵件收到更新通知" + +#: templates/web/base/auth/general.html:110 #: templates/web/zurich/auth/general.html:51 msgid "No let me sign in by email" msgstr "不 我要用電子郵件登入" -#: templates/web/base/report/_inspect.html:170 +#: templates/web/base/auth/general.html:108 +#, fuzzy +msgid "No let me sign in by email or text" +msgstr "不 我要用電子郵件登入" + +#: templates/web/base/report/_inspect.html:177 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:172 +#: templates/web/base/report/_inspect.html:179 msgid "Note: This report hasn't yet been sent onwards for action. Any changes made may not be passed on." msgstr "" -#: templates/web/base/auth/general.html:82 +#: templates/web/base/auth/general.html:79 #: templates/web/base/report/new/form_user_loggedout_password.html:3 #: templates/web/base/report/update/form_user_loggedout_password.html:2 msgid "Yes I have a password" msgstr "是 我有密碼" +#: templates/web/base/my/my.html:39 templates/web/base/my/my.html:50 +msgid "Add" +msgstr "" + #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 msgid "" @@ -265,11 +280,17 @@ msgid "Add a contact using the form below." msgstr "增加聯絡人請使用下方表單" #: templates/web/base/admin/bodies.html:78 -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "新增有關單位" +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:7 +#, fuzzy +msgid "Add email address" +msgstr "禁止之電子郵件" + #: templates/web/base/admin/reportextrafields/index.html:24 msgid "Add extra fields" msgstr "" @@ -292,11 +313,17 @@ msgstr "新增種類" msgid "Add option" msgstr "(任選)" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:7 +#, fuzzy +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:140 -#: templates/web/base/report/_main.html:19 -#: templates/web/base/report/_main.html:30 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:15 +#: templates/web/base/report/_main.html:26 msgid "Add to shortlist" msgstr "" @@ -306,23 +333,23 @@ msgstr "" msgid "Add user" msgstr "新增使用者" -#: perllib/FixMyStreet/Cobrand/Default.pm:735 +#: perllib/FixMyStreet/Cobrand/Default.pm:718 msgid "Add/edit problem categories" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:737 +#: perllib/FixMyStreet/Cobrand/Default.pm:720 msgid "Add/edit response priorities" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:736 +#: perllib/FixMyStreet/Cobrand/Default.pm:719 msgid "Add/edit response templates" msgstr "" -#: templates/web/base/my/my.html:67 +#: templates/web/base/my/my.html:109 msgid "Added %s" msgstr "新增 %s" -#: templates/web/base/report/_main.html:149 +#: templates/web/base/report/_main.html:141 msgid "Adding this report to your shortlist will remove it from %s’s shortlist." msgstr "" @@ -346,9 +373,10 @@ msgstr "%d 關閉通知 " msgid "Alert me to future updates" msgstr "通知我此事後續" -#: templates/web/base/dashboard/index.html:138 -#: templates/web/base/dashboard/index.html:21 #: 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:63 #: templates/web/base/reports/_list-filters.html:3 msgid "All" msgstr "" @@ -357,12 +385,13 @@ msgstr "" msgid "All Reports" msgstr "所有事件申報" -#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/admin/stats/index.html:5 msgid "All Reports as CSV" msgstr "所有事件申報存成CSV格式" #: templates/web/base/admin/category-multiselect.html:5 #: templates/web/base/admin/responsepriorities/list.html:20 +#: templates/web/base/admin/templates.html:19 msgid "All categories" msgstr "" @@ -378,17 +407,17 @@ msgstr "" #: templates/web/base/main_nav_items.html:0 #: templates/web/base/main_nav_items.html:27 #: templates/web/zurich/admin/index-dm.html:12 -#: templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:20 +#: templates/web/zurich/admin/stats/index.html:13 +#: templates/web/zurich/footer.html:20 #: templates/web/zurich/nav_over_content.html:6 msgid "All reports" msgstr "所有事件申報" -#: templates/web/base/admin/stats.html:5 -#: templates/web/zurich/admin/stats.html:8 +#: templates/web/zurich/admin/stats/index.html:8 msgid "All reports between %s and %s" msgstr "%s 與 %s 之間申報" -#: templates/web/base/reports/index.html:23 +#: templates/web/base/reports/index.html:25 msgid "All time" msgstr "" @@ -426,7 +455,8 @@ msgid "Are you sure you want to cancel this upload?" msgstr "" #: templates/web/base/admin/report_edit.html:84 -#: templates/web/base/js/translation_strings.html:69 +#: templates/web/base/admin/template_edit.html:75 +#: templates/web/base/js/translation_strings.html:73 #: templates/web/base/report/display_tools.html:6 msgid "Are you sure?" msgstr "" @@ -437,7 +467,7 @@ msgstr "" msgid "Area covered" msgstr "涵蓋區域" -#: templates/web/base/admin/user-form.html:64 +#: templates/web/base/admin/user-form.html:82 msgid "Area:" msgstr "" @@ -451,7 +481,7 @@ msgid "Assign to competent body:" msgstr "分派給適任的機關　" #: templates/web/zurich/admin/report_edit.html:169 -#: templates/web/zurich/admin/stats.html:36 +#: templates/web/zurich/admin/stats/index.html:36 msgid "Assign to different category:" msgstr "歸至其它種類" @@ -463,7 +493,7 @@ msgstr "分派給外部機：" msgid "Assign to subdivision:" msgstr "交派給下級單位：" -#: perllib/FixMyStreet/Cobrand/Default.pm:732 +#: perllib/FixMyStreet/Cobrand/Default.pm:715 msgid "Assign users to areas" msgstr "" @@ -479,12 +509,17 @@ msgstr "每一則詢問的申報幾乎達 %d地回覆了。所有的要求，依 msgid "At the moment only searching for and looking at reports work." msgstr "目前僅提供部份查詢與查閱" -#: templates/web/base/admin/user-form.html:78 -#: templates/web/base/admin/user-form.html:79 +#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:97 msgid "Authorised staff users can be associated with the categories in which they operate." msgstr "" -#: templates/web/base/admin/template_edit.html:22 +#: templates/web/base/admin/templates.html:9 +#, fuzzy +msgid "Auto Response" +msgstr "無責任歸屬" + +#: templates/web/base/admin/template_edit.html:64 msgid "Auto-response:" msgstr "" @@ -492,18 +527,10 @@ msgstr "" msgid "Available categories" msgstr "" -#: templates/web/base/reports/index.html:84 +#: templates/web/base/reports/index.html:112 msgid "Average time between a problem being reported and being fixed, last 100 reports." msgstr "" -#: templates/web/base/dashboard/index.html:109 -msgid "Average time to council marking fixed (days)" -msgstr "" - -#: templates/web/base/dashboard/index.html:117 -msgid "Average time to first council state change (days)" -msgstr "" - #: templates/web/base/report/new/after_photo.html:6 msgid "Avoid personal information and vehicle number plates" msgstr "" @@ -517,20 +544,21 @@ msgstr "待核可" msgid "Back" msgstr "回上層" -#: templates/web/base/report/_main.html:6 +#: templates/web/base/report/_main.html:2 msgid "Back to all reports" msgstr "" #: templates/web/base/admin/report_blocks.html:18 -msgid "Ban email address" -msgstr "禁止之電子郵件" +#, fuzzy +msgid "Ban user" +msgstr "標記警告用戶" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 -#: perllib/FixMyStreet/Cobrand/Default.pm:734 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 +#: perllib/FixMyStreet/Cobrand/Default.pm:717 #: perllib/FixMyStreet/Cobrand/Zurich.pm:396 #: templates/web/base/admin/bodies.html:1 #: templates/web/base/admin/report_edit.html:55 -#: templates/web/zurich/header.html:56 +#: templates/web/zurich/header.html:50 msgid "Bodies" msgstr "有關單位" @@ -541,14 +569,10 @@ msgstr "有關單位" msgid "Body" msgstr "有關單位" -#: templates/web/base/admin/user-form.html:36 +#: templates/web/base/admin/user-form.html:54 msgid "Body:" msgstr "有關單位:" -#: templates/web/base/admin/stats.html:87 -msgid "By Date" -msgstr "日期" - #: templates/web/base/admin/extra-metadata-form.html:36 msgid "Can be used to display extra text to the user alongside the field. The default template does not show this (meta.datatype_description), you must add it in category_extras_fields.html" msgstr "" @@ -561,8 +585,9 @@ msgstr "你的信箱中找不到我們的來信嗎？先檢查看看垃圾回收 msgid "Can't see the map? Skip this step" msgstr "無法顯示地圖？ 略過本步驟" -#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/Default.pm:633 #: templates/web/base/admin/responsepriorities/list.html:8 +#: templates/web/base/admin/templates.html:7 msgid "Categories" msgstr "" @@ -573,30 +598,36 @@ 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/report/_inspect.html:48 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:99 +#: templates/web/base/report/_inspect.html:54 #: templates/web/base/report/_item.html:92 -#: templates/web/base/report/new/category.html:6 +#: templates/web/base/report/new/category.html:12 #: 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.html:50 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Category" msgstr "類別" -#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: templates/web/base/dashboard/index.html:102 +#, fuzzy +msgid "Category and State" +msgstr "類別" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:975 msgid "Category changed from ‘%s’ to ‘%s’" msgstr "" -#: templates/web/base/admin/stats.html:58 -#: templates/web/base/admin/stats_fix_rate.html:1 +#: templates/web/base/admin/stats/fix_rate.html:1 +#: templates/web/base/admin/stats/index.html:6 msgid "Category fix rate for problems > 4 weeks old" msgstr "4週前己修復問題之類別" #: templates/web/base/admin/report_edit.html:119 -#: templates/web/base/dashboard/index.html:29 +#: templates/web/base/dashboard/index.html:39 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/contact-form.html:2 #: templates/web/zurich/admin/report_edit-sdm.html:72 @@ -604,17 +635,17 @@ msgstr "4週前己修復問題之類別" msgid "Category:" msgstr "類別:" -#: perllib/FixMyStreet/Script/Reports.pm:188 +#: perllib/FixMyStreet/Script/Reports.pm:187 msgid "Category: %s" msgstr "類別: %s" -#: templates/web/base/my/my.html:24 -msgid "Change email" +#: templates/web/base/my/my.html:41 templates/web/base/my/my.html:44 +#: templates/web/base/my/my.html:52 templates/web/base/my/my.html:57 +msgid "Change" msgstr "" #: templates/web/base/auth/change_email.html:1 #: templates/web/base/auth/change_email.html:3 -#: templates/web/base/auth/change_email.html:30 msgid "Change email address" msgstr "" @@ -622,10 +653,16 @@ msgstr "" #: templates/web/base/auth/change_password.html:16 #: templates/web/base/auth/change_password.html:4 #: templates/web/base/auth/change_password.html:43 -#: templates/web/base/my/my.html:23 +#: templates/web/base/my/my.html:63 msgid "Change password" msgstr "更換密碼" +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:3 +#, fuzzy +msgid "Change phone number" +msgstr "(沒有電話號碼)" + #: templates/web/base/admin/contact-form.html:80 msgid "Check inspection required if reports in this category must be inspected before being sent." msgstr "" @@ -653,19 +690,14 @@ msgid "" " 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:103 +#: templates/web/base/report/_inspect.html:109 msgid "Choose another" msgstr "" -#: templates/web/base/js/translation_strings.html:68 +#: templates/web/base/js/translation_strings.html:72 msgid "Clear offline data" msgstr "" -#: templates/web/base/admin/stats.html:72 -#: templates/web/base/admin/stats.html:78 -msgid "Click here or enter as dd/mm/yyyy" -msgstr "點選此處或輸入日期/月份/年份" - #: templates/web/base/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "點擊地圖以申報問題 " @@ -694,18 +726,19 @@ msgstr "選擇確認電子郵件上的連結以作登入" #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:134 #: perllib/FixMyStreet/Cobrand/Zurich.pm:194 #: perllib/FixMyStreet/Cobrand/Zurich.pm:965 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:11 +#: 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:112 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:10 #: templates/web/zurich/admin/header.html:16 -#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/admin/stats/index.html:31 msgid "Closed" msgstr "關閉" -#: perllib/FixMyStreet/DB/Result/Problem.pm:826 +#: perllib/FixMyStreet/DB/Result/Problem.pm:844 msgid "Closed by council" msgstr "由地方政府關閉" @@ -720,16 +753,17 @@ msgid "Cobrand" msgstr "聯合品牌" #: templates/web/base/admin/report_edit.html:92 -#: templates/web/base/admin/update_edit.html:52 +#: templates/web/base/admin/update_edit.html:54 msgid "Cobrand data:" msgstr "聯合品牌資料:" #: templates/web/base/admin/report_edit.html:91 -#: templates/web/base/admin/update_edit.html:51 +#: templates/web/base/admin/update_edit.html:53 msgid "Cobrand:" msgstr "聯合品牌:" #: templates/web/base/admin/extra-metadata-form.html:14 +#: templates/web/base/auth/smsform.html:24 msgid "Code" msgstr "" @@ -737,7 +771,7 @@ msgstr "" msgid "Collapse map" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:646 +#: perllib/FixMyStreet/Cobrand/Default.pm:629 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "設定" @@ -746,7 +780,7 @@ msgstr "設定" msgid "Confirm" msgstr "確認" -#: templates/web/base/auth/token.html:1 +#: templates/web/base/auth/smsform.html:1 templates/web/base/auth/token.html:1 msgid "Confirm account" msgstr "確認帳戶" @@ -765,14 +799,10 @@ msgstr "確認" #: templates/web/base/admin/contact-form.html:56 #: templates/web/zurich/admin/contact-form.html:12 -#: templates/web/zurich/admin/stats.html:40 +#: templates/web/zurich/admin/stats/index.html:40 msgid "Confirmed" msgstr "已確認" -#: templates/web/base/admin/stats.html:5 -msgid "Confirmed reports between %s and %s" -msgstr "%s 與 %s 之間已確認的申報" - #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 #: templates/web/base/admin/report_edit.html:78 @@ -799,8 +829,8 @@ msgstr "連結本團隊" msgid "Coordinates:" msgstr "協同單位:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1773 #: perllib/FixMyStreet/App/Controller/Admin.pm:1801 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1830 msgid "Could not find user" msgstr "找不到該戶用" @@ -818,43 +848,16 @@ msgstr "地方政府" msgid "Council contacts for %s" msgstr "聯繋地方政府 %s" -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:83 -msgid "Council has marked as closed" -msgstr "" - -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:57 -msgid "Council has marked as fixed" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:80 -msgid "Council has marked as in progress" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:82 -msgid "Council has marked as investigating" -msgstr "" - -#: templates/web/base/dashboard/index.html:78 -#: templates/web/base/dashboard/index.html:81 -msgid "Council has marked as planned" -msgstr "" - #: templates/web/base/report/_council_sent_info.html:6 msgid "Council ref: %s" msgstr "地方政府流水號　ref: %s" -#: templates/web/base/admin/stats.html:92 +#: templates/web/base/dashboard/index.html:50 msgid "Council:" msgstr "地方政府" -#: templates/web/base/admin/stats.html:12 -#: templates/web/base/admin/stats.html:32 -#: templates/web/zurich/admin/stats.html:45 -#: templates/web/zurich/admin/stats.html:50 +#: templates/web/zurich/admin/stats/index.html:45 +#: templates/web/zurich/admin/stats/index.html:50 msgid "Count" msgstr "數量" @@ -876,39 +879,44 @@ msgstr "創建類別" msgid "Create priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:718 +#: perllib/FixMyStreet/Cobrand/Default.pm:701 msgid "Create reports/updates as anonymous user" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:719 +#: perllib/FixMyStreet/Cobrand/Default.pm:702 msgid "Create reports/updates as the council" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:717 +#: perllib/FixMyStreet/Cobrand/Default.pm:700 msgid "Create reports/updates on a user's behalf" msgstr "" -#: templates/web/base/admin/template_edit.html:46 +#: templates/web/base/admin/template_edit.html:71 #: templates/web/zurich/admin/template_edit.html:29 msgid "Create template" msgstr "創建模版" #: templates/web/base/admin/problem_row.html:34 -#: templates/web/base/admin/templates.html:12 +#: templates/web/zurich/admin/templates.html:10 msgid "Created" msgstr "建立" #: templates/web/base/admin/list_updates.html:38 #: templates/web/base/admin/report_edit.html:77 -#: templates/web/base/admin/update_edit.html:53 +#: templates/web/base/admin/update_edit.html:55 #: templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "建立:" -#: templates/web/base/admin/stats.html:31 -msgid "Current state" +#: templates/web/base/auth/generate_token.html:27 +#, fuzzy +msgid "Current token:" msgstr "目前狀況" +#: templates/web/base/dashboard/index.html:91 +msgid "Currently grouped by %s" +msgstr "" + #: templates/web/base/admin/bodies.html:9 #: templates/web/base/admin/index.html:17 msgid "Currently no bodies have been created." @@ -919,14 +927,14 @@ msgstr "目前未創建內文" msgid "Customer not contactable" msgstr "無法聨絡上的客戶" -#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:9 #: templates/web/base/reports/index.html:15 #: templates/web/base/reports/index.html:18 msgid "Dashboard" msgstr "控制台" -#: templates/web/zurich/admin/stats.html:35 +#: templates/web/zurich/admin/stats/index.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "下屬單位5個工作天內處理。" @@ -938,12 +946,12 @@ msgstr "" msgid "Default priority" msgstr "" -#: templates/web/base/report/_inspect.html:72 +#: templates/web/base/report/_inspect.html:78 msgid "Defect type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1078 -#: templates/web/base/admin/template_edit.html:50 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1104 +#: templates/web/base/admin/template_edit.html:75 #: templates/web/zurich/admin/template_edit.html:33 msgid "Delete template" msgstr "刪除模版" @@ -954,8 +962,8 @@ msgstr "刪除模版" msgid "Deleted" msgstr "刪除" -#: templates/web/base/report/_main.html:114 -#: templates/web/base/report/update.html:68 +#: templates/web/base/report/_main.html:110 +#: templates/web/base/report/update.html:71 msgid "Describe why you are moderating this" msgstr "" @@ -971,6 +979,10 @@ msgstr "描述" msgid "Description:" msgstr "" +#: perllib/FixMyStreet/App/Controller/Report.pm:350 +msgid "Detailed information is limited to %d characters." +msgstr "" + #: templates/web/base/js/translation_strings.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:45 msgid "Details" @@ -983,6 +995,10 @@ msgstr "細節" msgid "Details:" msgstr "細節:" +#: templates/web/base/dashboard/index.html:103 +msgid "Device and Site" +msgstr "" + #: templates/web/base/admin/body.html:92 msgid "Devolved" msgstr "下放" @@ -996,8 +1012,8 @@ msgstr "不使用地圖" msgid "Diligency prize league table" msgstr "勤奮表現名單" -#: templates/web/base/report/_main.html:118 -#: templates/web/base/report/update.html:70 +#: templates/web/base/report/_main.html:114 +#: templates/web/base/report/update.html:73 msgid "Discard changes" msgstr "" @@ -1006,7 +1022,7 @@ msgid "Do not send email alerts on fetched comments to problem creator" msgstr "" #. ("%s is the site name") -#: templates/web/base/auth/general.html:60 +#: templates/web/base/auth/general.html:57 #: templates/web/base/report/new/form_user_loggedout.html:25 #: templates/web/base/report/new/oauth_email_form.html:18 #: templates/web/base/report/update-form.html:30 @@ -1014,7 +1030,7 @@ msgstr "" msgid "Do you have a %s password?" msgstr "您是否有 %s密碼？ " -#: templates/web/base/report/_inspect.html:87 +#: templates/web/base/report/_inspect.html:93 msgid "Do you want to automatically raise a defect?" msgstr "" @@ -1034,11 +1050,11 @@ msgstr "" msgid "Drag and drop photos here or click to upload" msgstr "" -#: templates/web/base/report/_inspect.html:98 +#: templates/web/base/report/_inspect.html:104 msgid "Duplicate of" msgstr "" -#: templates/web/base/report/_inspect.html:108 +#: templates/web/base/report/_inspect.html:114 msgid "Duplicates" msgstr "" @@ -1061,9 +1077,10 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 #: templates/web/base/admin/responsepriorities/list.html:28 -#: templates/web/base/admin/templates.html:22 +#: templates/web/base/admin/templates.html:28 #: templates/web/base/admin/users.html:34 #: templates/web/zurich/admin/problem_row.html:48 +#: templates/web/zurich/admin/templates.html:20 msgid "Edit" msgstr "編輯" @@ -1073,33 +1090,33 @@ msgstr "編輯" msgid "Edit body details" msgstr "編輯有關單位細節" -#: perllib/FixMyStreet/Cobrand/Default.pm:729 +#: perllib/FixMyStreet/Cobrand/Default.pm:712 msgid "Edit other users' details" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:730 +#: perllib/FixMyStreet/Cobrand/Default.pm:713 msgid "Edit other users' permissions" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:712 +#: perllib/FixMyStreet/Cobrand/Default.pm:695 msgid "Edit report category" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:713 +#: perllib/FixMyStreet/Cobrand/Default.pm:696 msgid "Edit report priority" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:711 +#: perllib/FixMyStreet/Cobrand/Default.pm:694 msgid "Edit reports" msgstr "" #: templates/web/base/admin/report_edit.html:0 #: templates/web/base/admin/report_edit.html:14 -#: templates/web/base/admin/report_edit.html:4 +#: templates/web/base/admin/report_edit.html:5 #: templates/web/zurich/admin/report_edit-sdm.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:5 +#: templates/web/zurich/admin/report_edit-sdm.html:6 #: templates/web/zurich/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit.html:5 +#: templates/web/zurich/admin/report_edit.html:6 msgid "Editing problem %d" msgstr "編輯問題 %d" @@ -1120,7 +1137,6 @@ msgstr "編輯器" #: templates/web/base/admin/category_edit.html:28 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:17 -#: templates/web/base/auth/general.html:51 #: templates/web/zurich/admin/body-form.html:9 #: templates/web/zurich/admin/body.html:15 #: templates/web/zurich/auth/general.html:24 @@ -1128,17 +1144,20 @@ msgstr "編輯器" msgid "Email" msgstr "電子郵件" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1749 -msgid "Email added to abuse list" -msgstr "電子郵件列入濫發名單" - #: templates/web/base/admin/contact-form.html:38 #: templates/web/base/alert/_list.html:74 -#: templates/web/base/report/new/form_user_loggedin.html:32 +#: templates/web/base/auth/change_email.html:37 +#: templates/web/base/report/new/form_user_loggedin.html:38 #: templates/web/base/report/update/form_name.html:23 msgid "Email address" msgstr "" +#: templates/web/base/report/new/form_user_loggedin.html:71 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:34 +#, fuzzy +msgid "Email address (optional)" +msgstr "密碼(任選):" + #: templates/web/base/tokens/confirm_alert.html:6 msgid "Email alert created" msgstr "建立電郵通知" @@ -1147,19 +1166,18 @@ msgstr "建立電郵通知" msgid "Email alert deleted" msgstr "取消電郵通知" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1746 -msgid "Email already in abuse list" -msgstr "電子郵件己在濫發名單" +#: templates/web/base/admin/user-form.html:22 +msgid "Email verified:" +msgstr "" -#: templates/web/base/admin/report_edit.html:129 -#: templates/web/base/admin/update_edit.html:35 -#: templates/web/base/admin/user-form.html:19 +#: templates/web/base/admin/report_edit.html:138 +#: templates/web/base/admin/user-form.html:19 templates/web/base/my/my.html:36 #: templates/web/zurich/admin/body.html:48 #: templates/web/zurich/admin/contact-form.html:6 msgid "Email:" msgstr "電子郵件:" -#: perllib/FixMyStreet/Script/Reports.pm:112 +#: perllib/FixMyStreet/Script/Reports.pm:111 msgid "Email: %s" msgstr "電子郵件: %s" @@ -1175,8 +1193,8 @@ msgstr "" "如果您不確定是否要開啟，請保留空白\n" "更多資訊說明請見本文(英文)." +#: templates/web/base/admin/body-form.html:121 #: templates/web/base/admin/body-form.html:122 -#: templates/web/base/admin/body-form.html:123 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" @@ -1185,8 +1203,9 @@ msgstr "" "開啟此設定將造成權限混亂因相關單位可能有多位承辦人員使用不同\n" "端點(與送出方式)。例如，如果某些類別的問題申報必須由電子郵件送出，而其它類別則透過Open311送出。" -#: templates/web/base/admin/stats.html:77 -msgid "End Date:" +#: templates/web/base/dashboard/index.html:77 +#, fuzzy +msgid "End Date" msgstr "結束日期:" #: templates/web/base/admin/open311-form-fields.html:21 @@ -1207,14 +1226,14 @@ msgid "Enter a nearby postcode, or street name and area" msgstr "輸入本區的郵編，街名或區域。" #: perllib/FixMyStreet/Cobrand/DansMonQwat.pm:14 -#: templates/web/base/around/postcode_form.html:5 -#: templates/web/base/around/postcode_form.html:6 +#: templates/web/base/around/postcode_form.html:7 +#: templates/web/base/around/postcode_form.html:8 msgid "Enter a nearby street name and area" msgstr "輸入最近的街名或地區" -#: templates/web/base/auth/general.html:118 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:35 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 +#: templates/web/base/auth/general.html:123 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:45 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:17 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" msgstr "請輸入密碼" @@ -1232,8 +1251,8 @@ msgstr "請在此填寫問題的細節" msgid "Error" msgstr "錯誤" -#: templates/web/base/reports/_list-filters.html:31 #: templates/web/base/reports/_list-filters.html:39 +#: templates/web/base/reports/_list-filters.html:47 msgid "Everything" msgstr "一切" @@ -1258,7 +1277,7 @@ msgstr "" msgid "Explain what’s wrong" msgstr "" -#: templates/web/base/dashboard/index.html:147 +#: templates/web/base/dashboard/index.html:104 msgid "Export as CSV" msgstr "" @@ -1274,7 +1293,7 @@ msgstr "外圍" msgid "External ID" msgstr "" -#: templates/web/base/admin/body-form.html:89 +#: templates/web/base/admin/body-form.html:88 msgid "External URL" msgstr "外部網址" @@ -1286,7 +1305,7 @@ msgstr "" msgid "External team" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:673 +#: perllib/FixMyStreet/Cobrand/Default.pm:656 #: templates/web/base/admin/reportextrafields/edit.html:1 #: templates/web/base/admin/reportextrafields/index.html:1 #, fuzzy @@ -1298,7 +1317,7 @@ msgstr "其它資料：" msgid "Extra data:" msgstr "其它資料：" -#: templates/web/base/report/_inspect.html:144 +#: templates/web/base/report/_inspect.html:150 #: templates/web/base/report/_item.html:108 msgid "Extra details" msgstr "" @@ -1328,21 +1347,22 @@ msgstr "選擇涵蓋的區域 編輯有關單位 表 #: perllib/FixMyStreet/App/Controller/Admin/States.pm:35 #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:133 #: templates/web/base/admin/states/index.html:29 -#: templates/web/base/admin/stats_fix_rate.html:4 +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/dashboard/index.html:113 msgid "Fixed" msgstr "已處理" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:62 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:66 msgid "Fixed - Council" msgstr "已處理－地方政府" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:63 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:67 msgid "Fixed - User" msgstr "已處理－用戶" -#: templates/web/base/admin/body-form.html:97 +#: templates/web/base/admin/body-form.html:96 #: templates/web/base/admin/responsepriorities/edit.html:53 -#: templates/web/zurich/admin/body-form.html:36 +#: templates/web/zurich/admin/body-form.html:35 msgid "Flag as deleted" msgstr "標記警告為刪除　" @@ -1350,7 +1370,7 @@ msgstr "標記警告為刪除　" msgid "Flag user" msgstr "標記警告用戶" -#: perllib/FixMyStreet/Cobrand/Default.pm:644 +#: perllib/FixMyStreet/Cobrand/Default.pm:627 #: templates/web/base/admin/users.html:20 msgid "Flagged" msgstr "標記警告" @@ -1359,7 +1379,7 @@ msgstr "標記警告" msgid "Flagged reports and users" msgstr "標記警告申報與用戶" -#: templates/web/base/admin/user-form.html:94 +#: templates/web/base/admin/user-form.html:112 msgid "Flagged users are listed on the flagged page." msgstr "標記警告用戶其已被列入 警告頁" @@ -1367,8 +1387,8 @@ 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:135 -#: templates/web/base/admin/user-form.html:100 +#: templates/web/base/admin/report_edit.html:140 +#: templates/web/base/admin/user-form.html:118 msgid "Flagged:" msgstr "警告:" @@ -1388,7 +1408,7 @@ msgstr "" msgid "For more information, see How FixMyStreet uses Mapit." msgstr "更多資訊，請詳見如何使用 FixMyStreet 地圖標記（英文）" -#: templates/web/base/auth/general.html:97 +#: templates/web/base/auth/general.html:94 #: templates/web/base/report/new/form_user_loggedout_password.html:20 #: templates/web/base/report/update/form_user_loggedout_password.html:19 msgid "Forgotten your password?" @@ -1408,8 +1428,12 @@ msgstr "轉寄願望給外部機構" msgid "Frequently Asked Questions" msgstr "常見問題回覆　" -#: templates/web/base/admin/stats.html:102 -msgid "Get Count" +#: templates/web/base/auth/generate_token.html:1 +#: templates/web/base/auth/generate_token.html:2 +#: templates/web/base/auth/generate_token.html:20 +#: templates/web/base/auth/generate_token.html:33 +#: templates/web/base/my/my.html:65 +msgid "Generate token" msgstr "" #: templates/web/base/around/_updates.html:3 @@ -1442,12 +1466,12 @@ 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:34 -#: templates/web/base/around/postcode_form.html:13 -#: templates/web/base/reports/_list-filters.html:49 -#: templates/web/base/reports/_list-filters.html:64 -#: templates/web/base/reports/index.html:75 -#: templates/web/zurich/admin/stats.html:26 +#: templates/web/base/alert/index.html:35 +#: templates/web/base/around/postcode_form.html:15 +#: templates/web/base/reports/_list-filters.html:57 +#: templates/web/base/reports/_list-filters.html:72 +#: templates/web/base/reports/index.html:89 +#: templates/web/zurich/admin/stats/index.html:26 msgid "Go" msgstr "走" @@ -1455,7 +1479,7 @@ msgstr "走" msgid "Going to send questionnaire?" msgstr "即將送出問卷？" -#: perllib/FixMyStreet/Cobrand/Default.pm:731 +#: perllib/FixMyStreet/Cobrand/Default.pm:714 msgid "Grant access to the admin" msgstr "" @@ -1463,6 +1487,15 @@ msgstr "" msgid "Graph of problem creation by status over time" msgstr "隨時間産生的問題圖片" +#: templates/web/base/dashboard/index.html:93 +#, fuzzy +msgid "Group by %s" +msgstr "由 %s" + +#: templates/web/base/dashboard/index.html:98 +msgid "Group by:" +msgstr "" + #: templates/web/base/questionnaire/index.html:48 msgid "Has this problem been fixed?" msgstr "問題已處理了嗎?" @@ -1483,21 +1516,26 @@ msgstr "協助" msgid "Help %s resolve your problem quicker, by providing some extra detail. This extra information will not be published online." msgstr "" +#: templates/web/base/around/on_map_list_items.html:8 +#, fuzzy +msgid "Here are some other nearby reports:" +msgstr "最近申報之照片" + #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "您好 %s" #: perllib/FixMyStreet/Cobrand/Zurich.pm:911 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:60 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:64 #: templates/web/base/admin/update_edit.html:30 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:11 -#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/stats/index.html:32 #: templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "隱藏" -#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/_main.html:105 msgid "Hide entire report" msgstr "" @@ -1518,21 +1556,18 @@ msgstr "" msgid "Hide my name on this report" msgstr "" -#: templates/web/base/around/display_location.html:67 -msgid "Hide old" -msgstr "隱藏舊文" - -#: templates/web/base/around/display_location.html:62 +#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:68 #: templates/web/base/js/translation_strings.html:55 msgid "Hide pins" msgstr "隱藏地圖標示" -#: templates/web/base/report/update.html:15 +#: templates/web/base/report/update.html:13 msgid "Hide update completely?" msgstr "" #: templates/web/base/report/_report_meta_info.html:3 -#: templates/web/base/report/update.html:55 +#: templates/web/base/report/update.html:58 msgid "Hide your name?" msgstr "" @@ -1544,7 +1579,7 @@ msgstr "" msgid "History" msgstr "歷程　" -#: templates/web/base/around/display_location.html:75 +#: templates/web/base/around/display_location.html:73 msgid "Home" msgstr "首頁" @@ -1603,6 +1638,10 @@ msgstr "" msgid "If ticked the user won’t see an input field, just the ‘Description’ text." msgstr "" +#: templates/web/base/admin/template_edit.html:59 +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 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" @@ -1612,6 +1651,10 @@ msgstr "" "\n" "如果你想這樣，請確保你在有關單位中使用同一類別。" +#: templates/web/base/auth/generate_token.html:39 +msgid "If you generate a new token the existing token will no longer work." +msgstr "" + #: templates/web/base/questionnaire/completed.html:8 msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." msgstr "如果你對申報之問題有進一步狀況，歡迎回到本站留言更新" @@ -1620,7 +1663,7 @@ msgstr "如果你對申報之問題有進一步狀況，歡迎回到本站留言 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 "" -#: templates/web/base/admin/template_edit.html:29 +#: templates/web/base/admin/template_edit.html:39 msgid "If you only want this template to be an option for specific categories, pick them here. By default they will show for all categories." msgstr "" @@ -1629,7 +1672,7 @@ msgstr "" msgid "If you submit a problem here the problem will not be reported to the council." msgstr "" -#: templates/web/base/admin/template_edit.html:36 +#: templates/web/base/admin/template_edit.html:46 msgid "If you want to use this template to prefill the update field when changing a report’s state, select the state here." msgstr "" @@ -1714,11 +1757,7 @@ msgstr "信箱已閱畢！" msgid "Include reporter personal details" msgstr "包括申報人的個人細節" -#: templates/web/base/admin/stats.html:83 -msgid "Include unconfirmed reports" -msgstr "包括未確認的申報 " - -#: perllib/FixMyStreet/App/Controller/Open311.pm:351 +#: perllib/FixMyStreet/App/Controller/Open311.pm:352 msgid "Incorrect has_photo value \"%s\"" msgstr "不正確的照片值數 \"%s\"" @@ -1730,7 +1769,7 @@ msgstr "" msgid "Inspection required" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:715 +#: perllib/FixMyStreet/Cobrand/Default.pm:698 msgid "Instruct contractors to fix problems" msgstr "" @@ -1742,26 +1781,18 @@ msgstr "內部筆記" msgid "Internet glitch" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:336 +#: perllib/FixMyStreet/App/Controller/Open311.pm:337 msgid "Invalid agency_responsible value %s" msgstr "無效的權責單位數值 %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1607 -msgid "Invalid end date" -msgstr "無效的結束日期" - -#: perllib/FixMyStreet/App/Controller/Open311.pm:429 +#: perllib/FixMyStreet/App/Controller/Open311.pm:430 msgid "Invalid format %s specified." msgstr "無效的%s 特定格式" -#: perllib/FixMyStreet/App/Controller/Report.pm:409 +#: perllib/FixMyStreet/App/Controller/Report.pm:423 msgid "Invalid location. New location must be covered by the same council." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1603 -msgid "Invalid start date" -msgstr "無效的開始日期" - #: templates/web/base/contact/blurb.html:2 msgid "It's often quickest to check our FAQs and see if the answer is there." msgstr "最快方式是 先查看問答集 ，看看答案是否在此" @@ -1780,7 +1811,7 @@ msgstr "未知的管轄機關" msgid "Jurisdiction unknown" msgstr "未知的管轄機關" -#: templates/web/base/auth/general.html:93 +#: templates/web/base/auth/general.html:90 #: templates/web/base/report/new/form_user_loggedout_password.html:16 #: templates/web/base/report/update/form_user_loggedout_password.html:15 #: templates/web/zurich/auth/general.html:40 @@ -1805,12 +1836,7 @@ msgstr "" msgid "Languages" msgstr "" -#: templates/web/base/dashboard/index.html:50 -msgid "Last 4 weeks" -msgstr "" - -#: templates/web/base/dashboard/index.html:49 -#: templates/web/base/reports/index.html:38 +#: templates/web/base/reports/index.html:40 msgid "Last 7 days" msgstr "" @@ -1836,18 +1862,14 @@ msgstr "上一次更新:" msgid "Latitude/Longitude:" msgstr "" -#: templates/web/base/reports/_list-filters.html:61 +#: templates/web/base/reports/_list-filters.html:69 msgid "Least recently updated" msgstr "" -#: templates/web/base/admin/body-form.html:129 +#: templates/web/base/admin/body-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\")，此處請保留空白　" -#: templates/web/base/dashboard/index.html:151 -msgid "Less than 7 days old" -msgstr "" - #: templates/web/base/admin/extra-metadata-form.html:47 msgid "List" msgstr "" @@ -1856,13 +1878,13 @@ msgstr "" msgid "List all reported problems" msgstr "列出所有申報的問題　" -#: templates/web/base/report/new/category_wrapper.html:4 +#: templates/web/base/report/new/category_wrapper.html:8 msgid "Loading..." msgstr "載入中...." #: templates/web/base/alert/choose.html:1 -#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 -#: templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 +#: templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:2 +#: templates/web/base/alert/index.html:4 templates/web/base/alert/list.html:1 #: templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 msgid "Local RSS feeds and email alerts" @@ -1894,12 +1916,15 @@ msgstr "" msgid "Log in with Twitter" msgstr "" -#: templates/web/base/js/translation_strings.html:62 +#: templates/web/base/js/translation_strings.html:65 msgid "Log in with email" msgstr "" -#: templates/web/base/dashboard/index.html:146 -#: templates/web/base/dashboard/index.html:38 +#: templates/web/base/js/translation_strings.html:63 +msgid "Log in with email/text" +msgstr "" + +#: templates/web/base/dashboard/index.html:81 msgid "Look up" msgstr "" @@ -1907,11 +1932,11 @@ msgstr "" msgid "MAP" msgstr "地圖" -#: perllib/FixMyStreet/Cobrand/Default.pm:716 +#: perllib/FixMyStreet/Cobrand/Default.pm:699 msgid "Manage shortlist" msgstr "" -#: templates/web/base/reports/_list-filters.html:56 +#: templates/web/base/reports/_list-filters.html:64 msgid "Manual order" msgstr "" @@ -1923,11 +1948,11 @@ msgstr "地圖" msgid "Mark as sent" msgstr "標註為關閉" -#: templates/web/base/admin/user-form.html:92 +#: templates/web/base/admin/user-form.html:110 msgid "Mark users whose behaviour you want to keep a check on as flagged." msgstr "標註用戶哪些行為您將要給予警告標記." -#: perllib/FixMyStreet/Cobrand/Default.pm:714 +#: perllib/FixMyStreet/Cobrand/Default.pm:697 msgid "Markup problem details" msgstr "" @@ -1947,45 +1972,45 @@ msgstr "給外部機構的訊息" msgid "Missing bodies:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +#: perllib/FixMyStreet/App/Controller/Open311.pm:438 msgid "Missing jurisdiction_id" msgstr "遺失 jurisdiction_id" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:710 +#: perllib/FixMyStreet/Cobrand/Default.pm:693 msgid "Moderate report details" msgstr "" -#: templates/web/base/report/_main.html:134 +#: templates/web/base/report/_main.html:126 msgid "Moderate this report" msgstr "" -#: templates/web/base/report/update.html:12 +#: templates/web/base/report/update.html:10 msgid "Moderate this update" msgstr "" -#: templates/web/base/report/_main.html:73 -#: templates/web/base/report/update.html:58 +#: templates/web/base/report/_main.html:69 +#: templates/web/base/report/update.html:61 msgid "Moderated by %s at %s" msgstr "" -#: templates/web/zurich/admin/stats.html:34 +#: templates/web/zurich/admin/stats/index.html:34 msgid "Moderated by division within one working day" msgstr "一個工作天內協調出部門" -#: templates/web/base/report/_main.html:113 -#: templates/web/base/report/update.html:66 +#: templates/web/base/report/_main.html:109 +#: templates/web/base/report/update.html:69 msgid "Moderation reason:" msgstr "" -#: templates/web/base/admin/stats.html:11 +#: templates/web/base/dashboard/index.html:101 msgid "Month" msgstr "月份" -#: templates/web/base/reports/_list-filters.html:62 +#: templates/web/base/reports/_list-filters.html:70 msgid "Most commented" msgstr "" @@ -2003,9 +2028,9 @@ msgstr "" #: templates/web/base/admin/states/index.html:108 #: templates/web/base/admin/states/index.html:11 #: templates/web/base/admin/users.html:16 -#: templates/web/base/auth/general.html:108 -#: templates/web/base/report/new/form_user_loggedin.html:42 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:7 +#: templates/web/base/auth/general.html:113 +#: templates/web/base/report/new/form_user_loggedin.html:49 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:11 #: templates/web/base/report/update/form_name.html:27 #: templates/web/zurich/admin/body-form.html:4 #: templates/web/zurich/auth/general.html:60 @@ -2016,19 +2041,23 @@ msgstr "名字" #: templates/web/base/admin/report_edit.html:127 #: 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/zurich/admin/stats.html:41 +#: templates/web/base/admin/user-form.html:16 templates/web/base/my/my.html:35 +#: templates/web/zurich/admin/stats/index.html:41 msgid "Name:" msgstr "名字：" -#: perllib/FixMyStreet/Script/Reports.pm:111 +#: perllib/FixMyStreet/Script/Reports.pm:110 msgid "Name: %s" msgstr "名字： %s" -#: templates/web/base/report/_inspect.html:38 +#: templates/web/base/report/_inspect.html:44 msgid "Navigate to this problem" msgstr "" +#: templates/web/base/report/_inspect.html:39 +msgid "Nearest calculated address:" +msgstr "" + #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 #: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" @@ -2038,12 +2067,12 @@ 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:538 -#: perllib/FixMyStreet/Cobrand/Default.pm:566 +#: perllib/FixMyStreet/Cobrand/Default.pm:521 +#: perllib/FixMyStreet/Cobrand/Default.pm:549 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "找出地圖標記上最近的街道(利用 Bing Maps自動産生): %s" -#: perllib/FixMyStreet/Script/Alerts.pm:316 +#: perllib/FixMyStreet/Script/Alerts.pm:341 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -2059,19 +2088,24 @@ msgstr "" msgid "Nearly done! Now check your email…" msgstr "差不多快完成了，現在檢查您的電子信箱" +#: templates/web/base/auth/smsform.html:19 +#, fuzzy +msgid "Nearly done! Now check your phone…" +msgstr "差不多快完成了，現在檢查您的電子信箱" + #: perllib/FixMyStreet/Cobrand/Oxfordshire.pm:131 msgid "New" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:262 +#: perllib/FixMyStreet/App/Controller/Admin.pm:230 msgid "New body added" msgstr "新增內文" -#: perllib/FixMyStreet/App/Controller/Admin.pm:386 +#: perllib/FixMyStreet/App/Controller/Admin.pm:354 msgid "New category contact added" msgstr "新增類別承辦 人" -#: templates/web/base/auth/change_email.html:26 +#: templates/web/base/auth/change_email.html:39 msgid "New email address:" msgstr "" @@ -2092,6 +2126,11 @@ msgstr "" msgid "New password:" msgstr "" +#: templates/web/base/auth/change_phone.html:38 +#, fuzzy +msgid "New phone number:" +msgstr "(沒有電話號碼)" + #: templates/web/base/admin/responsepriorities/edit.html:4 #: templates/web/base/admin/responsepriorities/list.html:34 msgid "New priority" @@ -2121,18 +2160,19 @@ msgstr " FixMyStree{{Name}} 範圍 之新近問題　" msgid "New reports" msgstr "新的申報　" -#: templates/web/base/admin/questionnaire.html:24 #: templates/web/base/admin/states/index.html:91 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "New state" msgstr "新陳述" #: templates/web/base/admin/template_edit.html:4 -#: templates/web/base/admin/templates.html:28 +#: templates/web/base/admin/templates.html:34 #: templates/web/zurich/admin/template_edit.html:9 +#: templates/web/zurich/admin/templates.html:26 msgid "New template" msgstr "新模版" -#: templates/web/base/reports/_list-filters.html:58 +#: templates/web/base/reports/_list-filters.html:66 msgid "Newest" msgstr "" @@ -2140,7 +2180,7 @@ msgstr "" msgid "Next" msgstr "下一步" -#: perllib/FixMyStreet/Cobrand/Default.pm:1237 +#: perllib/FixMyStreet/Cobrand/Default.pm:1222 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 @@ -2152,22 +2192,18 @@ msgstr "下一步" #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:106 #: templates/web/base/questionnaire/index.html:55 -#: templates/web/base/report/_inspect.html:92 +#: templates/web/base/report/_inspect.html:98 msgid "No" msgstr "無" -#: templates/web/base/admin/user-form.html:66 +#: templates/web/base/admin/user-form.html:84 msgid "No area" msgstr "" -#: templates/web/base/admin/user-form.html:37 +#: templates/web/base/admin/user-form.html:55 msgid "No body" msgstr "無有關單位" -#: templates/web/base/admin/stats.html:93 -msgid "No council" -msgstr "無地方政府" - #: perllib/FixMyStreet/DB/Result/Problem.pm:372 msgid "No council selected" msgstr "未選擇地方政府" @@ -2197,6 +2233,10 @@ msgstr "" msgid "No inspections in the selected date range." msgstr "" +#: templates/web/base/around/on_map_list_items.html:13 +msgid "No reports to show on map, here are some nearby:" +msgstr "" + #: templates/web/base/js/translation_strings.html:37 msgid "No result returned" msgstr "查無結果" @@ -2221,15 +2261,15 @@ msgstr "無支援" msgid "None" msgstr "沒有" -#: templates/web/base/admin/user-form.html:58 -#: templates/web/base/admin/user-form.html:59 +#: templates/web/base/admin/user-form.html:76 +#: templates/web/base/admin/user-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:28 -#: templates/web/base/admin/user-form.html:29 +#: templates/web/base/admin/user-form.html:46 +#: templates/web/base/admin/user-form.html:47 msgid "" "Normal (public) users should not be associated with any body.
\n" " Authorised staff users can be associated with the body they represent.
\n" @@ -2252,7 +2292,7 @@ msgstr "無法聨絡" msgid "Not for my subdivision" msgstr "非下屬單位" -#: templates/web/base/admin/questionnaire.html:6 +#: templates/web/base/admin/stats/questionnaire.html:6 msgid "Not reported before" msgstr "之前未申報過" @@ -2266,10 +2306,6 @@ msgstr "未呈報給地方政府" msgid "Note" msgstr "註記" -#: templates/web/base/admin/stats.html:51 -msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" -msgstr "請注意這裏包括了本月份總結撰寫前，尚未確認的申報，所以數目可能稍有降低。" - #: templates/web/zurich/admin/body.html:55 #: templates/web/zurich/admin/contact-form.html:19 msgid "Note:" @@ -2297,37 +2333,46 @@ msgstr "現在送出您的申報 …" msgid "Now to submit your update…" msgstr "現在送出您更新的申報 … 您是否有本站帳密？" -#: templates/web/base/reports/index.html:98 +#: templates/web/base/reports/index.html:127 msgid "Number of problems reported in each category, in the last 7 days." msgstr "" +#: templates/web/base/reports/index.html:99 +msgid "Number of problems reported in each ward, in the last 7 days." +msgstr "" + #: templates/web/base/js/translation_strings.html:43 msgid "OK" msgstr "好了" -#: templates/web/base/js/translation_strings.html:70 +#: templates/web/base/js/translation_strings.html:74 msgid "Offline data cleared" msgstr "" -#: templates/web/base/js/translation_strings.html:67 +#: templates/web/base/js/translation_strings.html:71 msgid "Offline update data saved" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats/questionnaire.html:24 msgid "Old state" msgstr "舊陳述" -#: templates/web/base/reports/_list-filters.html:59 +#: templates/web/base/reports/_list-filters.html:67 msgid "Oldest" msgstr "" +#: perllib/FixMyStreet/SendReport/Email.pm:89 +msgid "On behalf of %s" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:174 #: perllib/FixMyStreet/Cobrand/Zurich.pm:905 -#: perllib/FixMyStreet/DB/ResultSet/State.pm:10 +#: 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:111 #: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/update_edit.html:18 @@ -2366,23 +2411,30 @@ msgstr "" msgid "Order" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:1107 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:675 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:676 -#: perllib/FixMyStreet/DB/Result/Problem.pm:579 -#: perllib/FixMyStreet/DB/Result/Problem.pm:586 -#: perllib/FixMyStreet/DB/Result/Problem.pm:601 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1238 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:689 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:690 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:719 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:722 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 #: perllib/FixMyStreet/DB/Result/Problem.pm:610 -#: perllib/FixMyStreet/Script/Reports.pm:183 -#: perllib/FixMyStreet/Script/Reports.pm:198 +#: perllib/FixMyStreet/DB/Result/Problem.pm:619 +#: perllib/FixMyStreet/Script/Reports.pm:182 +#: perllib/FixMyStreet/Script/Reports.pm:197 msgid "Other" msgstr "其它" -#: templates/web/base/reports/index.html:107 +#: templates/web/base/reports/index.html:136 msgid "Other categories" msgstr "" -#: templates/web/base/reports/index.html:92 +#: templates/web/base/reports/index.html:107 +#, fuzzy +msgid "Other wards" +msgstr "其它地區:" + +#: templates/web/base/reports/index.html:120 msgid "Overall average" msgstr "" @@ -2400,19 +2452,19 @@ msgstr "找無此頁" msgid "Parent" msgstr "上級 " -#: perllib/FixMyStreet/DB/ResultSet/State.pm:61 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:65 msgid "Partial" msgstr "部份" -#: templates/web/base/auth/general.html:111 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:28 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:6 +#: templates/web/base/auth/general.html:116 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:38 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:10 #: templates/web/zurich/auth/general.html:32 #: templates/web/zurich/auth/general.html:63 msgid "Password (optional)" msgstr "密碼(任選):" -#: templates/web/base/auth/general.html:84 +#: templates/web/base/auth/general.html:81 msgid "Password:" msgstr "密碼:" @@ -2420,7 +2472,7 @@ msgstr "密碼:" msgid "Permalink" msgstr "永久連結" -#: templates/web/base/admin/user-form.html:144 +#: templates/web/base/admin/user-form.html:162 msgid "Permissions:" msgstr "" @@ -2429,19 +2481,25 @@ msgstr "" msgid "Phone Reporter:" msgstr "已申報 %s" +#: templates/web/base/auth/change_phone.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:33 #: templates/web/zurich/report/new/fill_in_details_form.html:65 msgid "Phone number" msgstr "電話號碼" -#: templates/web/base/report/new/form_user_loggedin.html:59 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:25 +#: templates/web/base/report/new/form_user_loggedin.html:67 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:30 msgid "Phone number (optional)" msgstr "電話號碼(非必填)" -#: perllib/FixMyStreet/Script/Reports.pm:87 -#: templates/web/base/admin/report_edit.html:134 -#: templates/web/base/admin/user-form.html:21 -#: templates/web/zurich/admin/stats.html:39 +#: templates/web/base/admin/user-form.html:30 +#, fuzzy +msgid "Phone verified:" +msgstr "已申報 %s" + +#: templates/web/base/admin/report_edit.html:135 +#: templates/web/base/admin/user-form.html:27 templates/web/base/my/my.html:47 +#: templates/web/zurich/admin/stats/index.html:39 msgid "Phone:" msgstr "電話" @@ -2457,7 +2515,7 @@ msgstr "電話" #: 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.html:37 +#: templates/web/zurich/admin/stats/index.html:37 #: 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 @@ -2483,12 +2541,17 @@ msgstr "" msgid "Photos of recent nearby reports" msgstr "最近申報之照片" -#: templates/web/base/reports/index.html:63 -#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:76 +#: templates/web/base/reports/index.html:79 msgid "Pick your council" msgstr "" -#: templates/web/base/around/display_location.html:76 +#: templates/web/base/reports/index.html:66 +#: templates/web/base/reports/index.html:69 +msgid "Pick your ward" +msgstr "" + +#: templates/web/base/around/display_location.html:74 #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" msgstr "在地圖上作標記" @@ -2510,25 +2573,34 @@ msgstr "用語請遵守禮節，明確解釋問題 " msgid "Please check the passwords and try again" msgstr "請再次確認您的密碼" -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:18 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:45 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:9 +#: templates/web/base/auth/change_email.html:24 +#: templates/web/base/auth/change_email.html:27 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:9 msgid "Please check your email address is correct" msgstr "請確認您電郵地址無誤" -#: perllib/FixMyStreet/App/Controller/Admin.pm:329 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:873 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:896 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1334 +#: perllib/FixMyStreet/DB/Result/User.pm:198 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:7 +#, fuzzy +msgid "Please check your phone number is correct" +msgstr "請確認您電郵地址無誤" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:297 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:928 #: perllib/FixMyStreet/DB/Result/Problem.pm:383 -#: templates/web/base/js/translation_strings.html:9 +#: templates/web/base/js/translation_strings.html:10 msgid "Please choose a category" msgstr "請選擇類別" -#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 #: templates/web/base/admin/bodies.html:4 templates/web/base/admin/body.html:11 +#: templates/web/base/admin/template_edit.html:13 msgid "Please correct the errors below" msgstr "請更正下方之錯誤" @@ -2546,39 +2618,47 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "請勿濫用本服務，濫用將造成您的政府輕視其它使用者之意見　" -#: perllib/FixMyStreet/App/Controller/Admin.pm:330 +#: perllib/FixMyStreet/App/Controller/Admin.pm:298 #: perllib/FixMyStreet/DB/Result/Comment.pm:128 -#: templates/web/base/js/translation_strings.html:2 +#: templates/web/base/js/translation_strings.html:3 msgid "Please enter a message" msgstr "請寫下您的留言" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1305 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1469 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1332 +#: perllib/FixMyStreet/DB/Result/User.pm:200 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:4 +#, fuzzy +msgid "Please enter a mobile number" +msgstr "請輸入您的電話號碼" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1365 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1461 msgid "Please enter a name" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:497 +#: perllib/FixMyStreet/App/Controller/Admin.pm:465 msgid "Please enter a name for this body" msgstr "" #: templates/web/base/auth/change_password.html:22 #: templates/web/base/auth/change_password.html:25 -#: templates/web/base/js/translation_strings.html:19 +#: templates/web/base/js/translation_strings.html:20 msgid "Please enter a password" msgstr "請輸入密碼" #: perllib/FixMyStreet/App/Controller/Contact.pm:115 #: perllib/FixMyStreet/DB/Result/Problem.pm:366 -#: templates/web/base/js/translation_strings.html:3 +#: templates/web/base/js/translation_strings.html:4 msgid "Please enter a subject" msgstr "請填下主旨" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1302 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1466 -#: perllib/FixMyStreet/App/Controller/Admin.pm:343 -#: perllib/FixMyStreet/DB/Result/User.pm:164 -#: templates/web/base/js/translation_strings.html:12 -#: templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1362 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1452 +#: perllib/FixMyStreet/App/Controller/Admin.pm:311 +#: perllib/FixMyStreet/DB/Result/User.pm:193 +#: templates/web/base/js/translation_strings.html:13 +#: templates/web/base/js/translation_strings.html:17 msgid "Please enter a valid email" msgstr "請輸入有效電子郵件" @@ -2587,55 +2667,62 @@ msgstr "請輸入有效電子郵件" msgid "Please enter a valid email address" msgstr "請輸入有效的電子郵件" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1446 +#, fuzzy +msgid "Please enter a valid email or phone number" +msgstr "請輸入您的電話號碼" + #: perllib/FixMyStreet/DB/Result/Problem.pm:369 -#: templates/web/base/js/translation_strings.html:4 +#: templates/web/base/js/translation_strings.html:5 msgid "Please enter some details" msgstr "請填寫進一步細節" #: perllib/FixMyStreet/App/Controller/Contact.pm:114 -#: perllib/FixMyStreet/DB/Result/User.pm:161 -#: templates/web/base/auth/change_email.html:15 -#: templates/web/base/auth/change_email.html:17 -#: templates/web/base/auth/general.html:39 -#: templates/web/base/auth/general.html:44 -#: templates/web/base/js/translation_strings.html:11 -#: templates/web/base/js/translation_strings.html:15 +#: perllib/FixMyStreet/DB/Result/User.pm:191 +#: 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:12 +#: templates/web/base/js/translation_strings.html:16 #: templates/web/zurich/auth/general.html:3 #: templates/web/zurich/auth/general.html:8 msgid "Please enter your email" msgstr "請輸入您的電子郵件" -#: templates/web/base/report/new/form_user_loggedout_email.html:5 #: templates/web/zurich/report/new/fill_in_details_form.html:57 msgid "Please enter your email address" msgstr "請輸入您的電子郵件" -#: templates/web/base/js/translation_strings.html:25 +#: templates/web/base/js/translation_strings.html:26 msgid "Please enter your first name" msgstr "請輸入您的大名" #: perllib/FixMyStreet/Cobrand/UK.pm:326 -#: templates/web/base/js/translation_strings.html:7 +#: templates/web/base/js/translation_strings.html:8 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:113 #: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: perllib/FixMyStreet/DB/Result/Problem.pm:377 -#: perllib/FixMyStreet/DB/Result/User.pm:157 -#: templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/DB/Result/User.pm:186 +#: templates/web/base/js/translation_strings.html:7 msgid "Please enter your name" msgstr "請輸入您的姓氐" -#: templates/web/base/js/translation_strings.html:22 +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:6 +#: templates/web/base/js/translation_strings.html:23 msgid "Please enter your phone number" msgstr "請輸入您的電話號碼" -#: templates/web/base/js/translation_strings.html:26 +#: templates/web/base/js/translation_strings.html:27 msgid "Please enter your second name" msgstr "請輸入您的別名" -#: templates/web/base/js/translation_strings.html:24 +#: templates/web/base/js/translation_strings.html:25 msgid "Please enter your title" msgstr "請輸入您的稱呼" @@ -2684,7 +2771,12 @@ msgstr "" msgid "Please note:" msgstr "請加註記" -#: perllib/FixMyStreet/App/Controller/Report.pm:353 +#: perllib/FixMyStreet/App/Controller/Report.pm:385 +#, fuzzy +msgid "Please provide a duplicate ID or public update for this report." +msgstr "如果您是再次申報，請說明原因" + +#: perllib/FixMyStreet/App/Controller/Report.pm:367 msgid "Please provide a public update for this report." msgstr "" @@ -2724,6 +2816,11 @@ msgstr "請敍明該問題是否已解決" msgid "Please upload an image only" msgstr "" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1449 +msgid "Please verify at least one of email/phone" +msgstr "" + #: perllib/FixMyStreet/App/Controller/Contact.pm:116 msgid "Please write a message" msgstr "諘寫下您的留言" @@ -2733,7 +2830,7 @@ msgid "Please write your update here" msgstr "請寫下您的更新" #: templates/web/base/report/update-form.html:25 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:14 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:18 #: templates/web/base/report/update/form_user_loggedout_password.html:10 msgid "Post" msgstr "張貼" @@ -2742,15 +2839,15 @@ msgstr "張貼" msgid "Posted anonymously at %s" msgstr "匿名張貼 %s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:255 +#: perllib/FixMyStreet/DB/Result/Comment.pm:266 msgid "Posted by %s at %s" msgstr "由 %s 在 %s 張貼" -#: perllib/FixMyStreet/DB/Result/Comment.pm:243 +#: perllib/FixMyStreet/DB/Result/Comment.pm:254 msgid "Posted by %s (%s) at %s" msgstr "由%s (%s) 在%s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:245 +#: perllib/FixMyStreet/DB/Result/Comment.pm:256 msgid "Posted by %s at %s" msgstr "由%s 在%s" @@ -2762,11 +2859,11 @@ msgstr "Powered by F msgid "Previous" msgstr "之前" -#: perllib/FixMyStreet/Cobrand/Default.pm:665 +#: perllib/FixMyStreet/Cobrand/Default.pm:648 msgid "Priorities" msgstr "" -#: templates/web/base/report/_inspect.html:123 +#: templates/web/base/report/_inspect.html:129 #: templates/web/base/report/_item.html:100 msgid "Priority" msgstr "" @@ -2783,7 +2880,7 @@ msgstr "隱私與cookies" #: templates/web/base/admin/body.html:88 #: templates/web/base/admin/contact-form.html:75 -#: templates/web/base/admin/report_edit.html:137 +#: templates/web/base/admin/report_edit.html:142 msgid "Private" msgstr "私人" @@ -2807,21 +2904,21 @@ msgstr "%s　問題已被確認　" msgid "Problem %s sent to council %s" msgstr "%s　問題已送達到地方政府　%s　" -#: templates/web/base/admin/stats.html:57 -#: templates/web/base/admin/stats_by_state.html:12 +#: templates/web/base/admin/stats/index.html:5 +#: templates/web/base/admin/stats/state.html:12 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "本站出現故障問題　" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1272 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1309 msgid "Problem marked as open." msgstr "問題標註為開放" -#: templates/web/base/admin/questionnaire.html:21 +#: templates/web/base/admin/stats/questionnaire.html:21 msgid "Problem state change based on survey results" msgstr "依調查結果呈現的問題改善" -#: perllib/FixMyStreet/Cobrand/Default.pm:709 +#: perllib/FixMyStreet/Cobrand/Default.pm:692 #: templates/web/base/admin/flagged.html:10 msgid "Problems" msgstr "問題" @@ -2848,7 +2945,7 @@ msgstr "FixMyStreet　最近回報的已修復問題　" msgid "Problems within %.1fkm of %s" msgstr "該地點　%.1f公里內的問題　" -#: perllib/FixMyStreet/Cobrand/Default.pm:838 +#: perllib/FixMyStreet/Cobrand/Default.pm:821 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:137 #: perllib/FixMyStreet/Cobrand/UK.pm:215 perllib/FixMyStreet/Cobrand/UK.pm:257 #: perllib/FixMyStreet/Cobrand/UK.pm:269 @@ -2874,7 +2971,8 @@ msgstr "在 %s, %s的問題　" msgid "Property address:" msgstr "公物地址：" -#: templates/web/base/report/duplicate-no-updates.html:2 +#: templates/web/base/report/display.html:57 +#: templates/web/base/report/duplicate-no-updates.html:3 #: templates/web/base/report/update-form.html:6 msgid "Provide an update" msgstr "提供更新資訊" @@ -2883,12 +2981,12 @@ msgstr "提供更新資訊" msgid "Provide update as" msgstr "" -#: templates/web/base/auth/general.html:114 +#: templates/web/base/auth/general.html:119 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "提供名稱與密碼非為必要，但其可以讓您更便於申報問題，提供更新與管理您的申報。　　" -#: templates/web/base/report/new/form_user_loggedout_by_email.html:31 -#: templates/web/base/report/update/form_user_loggedout_by_email.html:9 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:41 +#: templates/web/base/report/update/form_user_loggedout_by_email.html:13 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "提供名稱與密碼非為必要，但其可以讓您更便於申報問題，提供更新與管理您的申報。" @@ -2901,12 +2999,12 @@ msgstr "" msgid "Public response:" msgstr "公眾反應" -#: templates/web/base/report/_inspect.html:162 +#: templates/web/base/report/_inspect.html:169 msgid "Public update:" msgstr "" #: templates/web/zurich/admin/report_edit.html:123 -#: templates/web/zurich/admin/stats.html:38 +#: templates/web/zurich/admin/stats/index.html:38 msgid "Publish photo" msgstr "發出照片" @@ -2961,7 +3059,7 @@ msgstr "%s, 在%s 里/區" msgid "RSS feed of nearby problems" msgstr " RSS訂閱 %s區域問題" -#: perllib/FixMyStreet/Cobrand/Default.pm:839 +#: perllib/FixMyStreet/Cobrand/Default.pm:822 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:136 #: perllib/FixMyStreet/Cobrand/UK.pm:222 msgid "RSS feed of problems within %s" @@ -2986,7 +3084,7 @@ msgstr "最近當地問題更新的RSS訂閱" msgid "Receive email when updates are left on this problem." msgstr "透過電子郵件收取該問題之更新消息" -#: perllib/FixMyStreet/DB/Result/Problem.pm:738 +#: perllib/FixMyStreet/DB/Result/Problem.pm:756 msgid "Received by %s moments later" msgstr "" @@ -3000,7 +3098,7 @@ msgstr "近期的當地問題%s　" msgid "Recently reported problems" msgstr "近期申報之問題　" -#: templates/web/base/reports/_list-filters.html:60 +#: templates/web/base/reports/_list-filters.html:68 msgid "Recently updated" msgstr "" @@ -3024,9 +3122,9 @@ msgstr "移除標記" #: templates/web/base/report/_item.html:12 #: templates/web/base/report/_item.html:9 -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:18 -#: templates/web/base/report/_main.html:26 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:14 +#: templates/web/base/report/_main.html:22 msgid "Remove from shortlist" msgstr "" @@ -3034,12 +3132,16 @@ msgstr "" msgid "Remove from site" msgstr "" -#: templates/web/base/admin/report_edit.html:154 -#: templates/web/base/admin/update_edit.html:69 +#: templates/web/base/admin/report_edit.html:159 +#: templates/web/base/admin/update_edit.html:71 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "移陯照片(無法回復)" +#: templates/web/base/auth/generate_token.html:33 +msgid "Replace token" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:239 msgid "Reply to user:" msgstr "給用戶的回應" @@ -3068,11 +3170,11 @@ msgstr "申報濫用" msgid "Report as" msgstr "" -#: perllib/FixMyStreet/App/Controller/Rss.pm:298 +#: perllib/FixMyStreet/App/Controller/Rss.pm:302 msgid "Report on %s" msgstr "在%s　申報　" -#: templates/web/base/dashboard/index.html:137 +#: templates/web/base/dashboard/index.html:61 msgid "Report state:" msgstr "" @@ -3087,17 +3189,17 @@ msgstr "申報你的問題" msgid "Report, view, or discuss local problems" msgstr "申報，檢視，或討論在地問題" -#: perllib/FixMyStreet/DB/Result/Problem.pm:590 +#: perllib/FixMyStreet/DB/Result/Problem.pm:599 #: templates/web/base/contact/index.html:55 msgid "Reported anonymously at %s" msgstr "在%s 匿名申報 " -#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/admin/stats/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:64 msgid "Reported before" msgstr "之前的申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:614 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:57 msgid "Reported by %s at %s" msgstr "由%s 的 %s 申報" @@ -3111,27 +3213,27 @@ msgstr "由　　申報" msgid "Reported in the %s category" msgstr "%s 種類之申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:587 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "%s 種類下的匿名申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:611 +#: perllib/FixMyStreet/DB/Result/Problem.pm:620 msgid "Reported in the %s category by %s at %s" msgstr "%s 在 %s　%s類別的申報　" -#: perllib/FixMyStreet/DB/Result/Problem.pm:584 +#: perllib/FixMyStreet/DB/Result/Problem.pm:593 msgid "Reported via %s anonymously at %s" msgstr "在%s 匿名申報 " -#: perllib/FixMyStreet/DB/Result/Problem.pm:608 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 msgid "Reported via %s by %s at %s" msgstr "%s　透過 %s　在　%s類別的申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:581 +#: perllib/FixMyStreet/DB/Result/Problem.pm:590 msgid "Reported via %s in the %s category anonymously at %s" msgstr "透過 %s　在　%s類別的匿名申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: perllib/FixMyStreet/DB/Result/Problem.pm:612 msgid "Reported via %s in the %s category by %s at %s" msgstr "%s 在 %s　%s類別的申報　" @@ -3140,8 +3242,8 @@ msgstr "%s 在 %s　%s類別的申報　" msgid "Reported:" msgstr "已申報 %s" -#: templates/web/base/around/index.html:2 -#: templates/web/base/around/lookup_by_ref.html:2 +#: templates/web/base/around/index.html:3 +#: templates/web/base/around/lookup_by_ref.html:3 #: templates/web/base/js/translation_strings.html:42 #: templates/web/base/report/new/fill_in_details.html:0 #: templates/web/base/report/new/fill_in_details.html:8 @@ -3149,10 +3251,9 @@ msgstr "已申報 %s" msgid "Reporting a problem" msgstr "申報問題" -#: perllib/FixMyStreet/Cobrand/Default.pm:655 +#: perllib/FixMyStreet/Cobrand/Default.pm:638 #: perllib/FixMyStreet/Cobrand/Zurich.pm:388 -#: templates/web/base/dashboard/index.html:134 -#: templates/web/zurich/header.html:52 +#: templates/web/zurich/header.html:46 msgid "Reports" msgstr "申報" @@ -3169,7 +3270,7 @@ msgstr "待核實之申報" msgid "Reports by destination" msgstr "由%s 的 %s 申報" -#: templates/web/base/admin/user-form.html:107 +#: templates/web/base/admin/user-form.html:125 msgid "Reports made by trusted users will be sent to the responsible body without being inspected first." msgstr "" @@ -3181,7 +3282,7 @@ msgstr "" msgid "Reports published" msgstr "己公開之申報" -#: templates/web/base/js/translation_strings.html:71 +#: templates/web/base/js/translation_strings.html:75 msgid "Reports saved offline." msgstr "" @@ -3237,21 +3338,22 @@ msgid "Response Templates" msgstr "" #: templates/web/base/admin/templates.html:1 -#: templates/web/base/admin/templates.html:4 #: templates/web/zurich/admin/template_edit.html:1 #: templates/web/zurich/admin/template_edit.html:4 +#: templates/web/zurich/admin/templates.html:1 +#: templates/web/zurich/admin/templates.html:3 msgid "Response Templates for %s" msgstr "%s的回應模版" -#: templates/web/base/report/update.html:40 +#: templates/web/base/report/update.html:38 msgid "Revert to original" msgstr "" -#: templates/web/base/report/_main.html:99 +#: templates/web/base/report/_main.html:95 msgid "Revert to original text" msgstr "" -#: templates/web/base/report/_main.html:50 +#: templates/web/base/report/_main.html:46 msgid "Revert to original title" msgstr "" @@ -3270,17 +3372,17 @@ msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s" msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1852 -#: templates/web/base/admin/report_edit.html:151 -#: templates/web/base/admin/update_edit.html:66 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1879 +#: templates/web/base/admin/report_edit.html:156 +#: templates/web/base/admin/update_edit.html:68 #: templates/web/zurich/admin/report_edit.html:118 msgid "Rotate Left" msgstr "左轉　" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1848 -#: templates/web/base/admin/report_edit.html:152 -#: templates/web/base/admin/update_edit.html:67 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1875 +#: templates/web/base/admin/report_edit.html:157 +#: templates/web/base/admin/update_edit.html:69 #: templates/web/zurich/admin/report_edit.html:119 msgid "Rotate Right" msgstr "右轉　" @@ -3290,21 +3392,21 @@ msgid "Rotating this photo will discard unsaved changes to the report." msgstr "旋轉這張照片將會導致申報中未存檔的照片更動消失" #: templates/web/base/js/translation_strings.html:47 -#: templates/web/base/maps/google-ol.html:16 +#: templates/web/base/maps/google-ol.html:2 msgid "Satellite" msgstr "衛星" -#: templates/web/base/report/_inspect.html:182 +#: templates/web/base/report/_inspect.html:189 msgid "Save + close as duplicate" msgstr "" #: templates/web/base/admin/contact-form.html:138 #: templates/web/base/admin/reportextrafields/edit.html:64 #: templates/web/base/admin/responsepriorities/edit.html:58 -#: templates/web/base/admin/template_edit.html:46 -#: templates/web/base/report/_inspect.html:182 -#: templates/web/base/report/_main.html:117 -#: templates/web/base/report/update.html:69 +#: templates/web/base/admin/template_edit.html:71 +#: templates/web/base/report/_inspect.html:189 +#: templates/web/base/report/_main.html:113 +#: templates/web/base/report/update.html:72 #: templates/web/zurich/admin/body.html:62 #: templates/web/zurich/admin/contact-form.html:22 #: templates/web/zurich/admin/template_edit.html:29 @@ -3315,12 +3417,12 @@ msgstr "儲存變動" msgid "Save new fields" msgstr "" -#: templates/web/base/report/_inspect.html:158 +#: templates/web/base/report/_inspect.html:165 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:72 +#: templates/web/base/js/translation_strings.html:76 msgid "Saving reports offline" msgstr "" @@ -3339,7 +3441,7 @@ msgstr "搜尋申報" msgid "Search Users" msgstr "搜尋使用者" -#: templates/web/zurich/header.html:74 +#: templates/web/zurich/header.html:68 msgid "Search reports" msgstr "搜尋申報" @@ -3350,6 +3452,7 @@ msgid "Search:" msgstr "搜尋" #: templates/web/base/admin/reports.html:27 +#: templates/web/base/around/lookup_by_ref.html:18 msgid "Searching found no reports." msgstr "查無此申報" @@ -3362,7 +3465,7 @@ msgstr "查無此用戶" msgid "See our privacy policy" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:720 +#: perllib/FixMyStreet/Cobrand/Default.pm:703 msgid "See user detail for reports created as the council" msgstr "" @@ -3371,8 +3474,8 @@ msgstr "" msgid "Select a body" msgstr "選擇單位" -#: templates/web/base/admin/body-form.html:79 -#: templates/web/zurich/admin/body-form.html:26 +#: templates/web/base/admin/body-form.html:78 +#: templates/web/zurich/admin/body-form.html:25 msgid "Select an area" msgstr "選擇區域" @@ -3392,11 +3495,16 @@ msgstr "" msgid "Send extended Open311 statuses with service request updates" msgstr "" +#: templates/web/base/auth/_username_error.html:1 +#: templates/web/base/auth/_username_error.html:5 +msgid "Sending a confirmation text failed: \"%s\"" +msgstr "" + #: perllib/FixMyStreet/Cobrand/Zurich.pm:831 msgid "Sent report back" msgstr "送回申報" -#: perllib/FixMyStreet/DB/Result/Problem.pm:741 +#: perllib/FixMyStreet/DB/Result/Problem.pm:759 msgid "Sent to %s %s later" msgstr "%s 稍後送給%s" @@ -3405,11 +3513,11 @@ msgid "Sent:" msgstr "送出" #: templates/web/base/admin/report_edit.html:90 -#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats/index.html:45 msgid "Service:" msgstr "服務" -#: templates/web/base/report/_inspect.html:41 +#: templates/web/base/report/_inspect.html:47 msgid "Set to my current location" msgstr "" @@ -3418,9 +3526,9 @@ msgid "Share" msgstr "分享" #: templates/web/base/main_nav_items.html:10 -#: templates/web/base/report/_main.html:140 -#: templates/web/base/report/_main.html:21 -#: templates/web/base/report/_main.html:29 +#: templates/web/base/report/_main.html:132 +#: templates/web/base/report/_main.html:17 +#: templates/web/base/report/_main.html:25 msgid "Shortlist" msgstr "" @@ -3428,19 +3536,19 @@ msgstr "" msgid "Shortlist all visible" msgstr "" -#: templates/web/base/report/_main.html:138 -#: templates/web/base/report/_main.html:20 -#: templates/web/base/report/_main.html:25 -#: templates/web/base/reports/_list-filters.html:9 +#: templates/web/base/report/_main.html:130 +#: templates/web/base/report/_main.html:16 +#: templates/web/base/report/_main.html:21 +#: templates/web/base/reports/_list-filters.html:17 msgid "Shortlisted" msgstr "" #: templates/web/base/report/_item.html:15 -#: templates/web/base/report/_main.html:148 +#: templates/web/base/report/_main.html:140 msgid "Shortlisted by %s" msgstr "" -#: templates/web/base/report/update.html:20 +#: templates/web/base/report/update.html:18 msgid "Show Photo?" msgstr "" @@ -3448,40 +3556,37 @@ msgstr "" msgid "Show all updates" msgstr "" -#: templates/web/base/report/new/form_user_loggedin.html:56 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:22 +#: templates/web/base/report/new/form_user_loggedin.html:63 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/base/report/update/form_name.html:37 msgid "Show my name publicly" msgstr "公開我的姓名" -#: templates/web/base/report/update.html:17 +#: templates/web/base/report/update.html:15 msgid "Show name publicly?" msgstr "" -#: templates/web/base/around/display_location.html:69 -msgid "Show old" -msgstr "顯示舊文" - -#: templates/web/base/report/_main.html:83 +#: templates/web/base/report/_main.html:79 msgid "Show photo" msgstr "" -#: templates/web/base/around/display_location.html:60 +#: templates/web/base/around/display_location.html:58 +#: templates/web/base/around/display_location.html:66 #: templates/web/base/js/translation_strings.html:54 msgid "Show pins" msgstr "顯示地圖標示" -#: templates/web/base/report/_main.html:60 +#: templates/web/base/report/_main.html:56 msgid "Show reporter’s name" msgstr "" -#: templates/web/base/reports/index.html:62 +#: templates/web/base/reports/index.html:64 msgid "Show reports in your area" msgstr "" -#: templates/web/base/auth/general.html:119 +#: templates/web/base/auth/general.html:124 #: templates/web/base/auth/general.html:3 -#: templates/web/base/auth/general.html:88 +#: templates/web/base/auth/general.html:85 #: templates/web/base/main_nav_items.html:6 #: templates/web/zurich/auth/general.html:18 #: templates/web/zurich/auth/general.html:35 @@ -3492,12 +3597,16 @@ msgstr "登入" msgid "Sign in by email instead, providing a new password. When you click the link in your email, your password will be updated." msgstr "" +#: templates/web/base/auth/general.html:96 +msgid "Sign in by email or text, providing a new password. When you click the link in your email or enter the SMS authentication code, your password will be updated." +msgstr "" + #: templates/web/base/auth/general.html:1 #: templates/web/zurich/auth/general.html:1 msgid "Sign in or create an account" msgstr "登入或新建帳戶" -#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:25 +#: templates/web/base/auth/sign_out.html:1 templates/web/base/my/my.html:67 #: templates/web/zurich/auth/sign_out.html:1 msgid "Sign out" msgstr "登出" @@ -3516,7 +3625,7 @@ msgstr "" "被送出至地方政府\n" "." -#: templates/web/base/alert/index.html:40 +#: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "最近申報之照片" @@ -3529,15 +3638,20 @@ msgstr "有些文字需在地化" msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "抱歉，該郵區號碼我們尚未支援" -#: templates/web/base/auth/token.html:8 +#: templates/web/base/auth/smsform.html:6 templates/web/base/auth/token.html:8 msgid "Sorry, that wasn’t a valid link" msgstr "抱歉這個wasn’t 為有效的網址連結" +#: templates/web/base/auth/smsform.html:16 +#, fuzzy +msgid "Sorry, that wasn’t the correct code" +msgstr "抱歉這個wasn’t 為有效的網址連結" + #: templates/web/base/tokens/abuse.html:5 msgid "Sorry, there has been an error confirming your problem." msgstr "抱歉無法確認你的問題" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:235 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:242 #: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:38 #: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 #: perllib/FixMyStreet/Geocode/OSM.pm:48 @@ -3570,20 +3684,21 @@ msgstr "" msgid "Sorry, you don't have permission to do that." msgstr "" -#: templates/web/base/reports/_list-filters.html:53 +#: templates/web/base/reports/_list-filters.html:61 msgid "Sort by" msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:65 msgid "Staff users have permission to log in to the admin." msgstr "" -#: templates/web/base/admin/user-form.html:50 +#: templates/web/base/admin/user-form.html:68 msgid "Staff:" msgstr "" -#: templates/web/base/admin/stats.html:71 -msgid "Start Date:" +#: templates/web/base/dashboard/index.html:73 +#, fuzzy +msgid "Start Date" msgstr "問始日：" #: templates/web/base/admin/body.html:73 @@ -3593,15 +3708,18 @@ msgstr "問始日：" #: 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:40 -#: templates/web/base/report/_inspect.html:82 +#: templates/web/base/admin/template_edit.html:50 +#: templates/web/base/admin/templates.html:8 +#: templates/web/base/dashboard/index.html:100 +#: templates/web/base/report/_inspect.html:88 #: templates/web/base/report/_item.html:96 #: templates/web/base/report/update/form_update.html:39 #: templates/web/zurich/admin/contact-form.html:10 msgid "State" msgstr "陳述" -#: templates/web/base/report/update.html:48 +#: perllib/FixMyStreet/Script/Alerts.pm:102 +#: templates/web/base/report/update.html:49 #, fuzzy msgid "State changed to:" msgstr "儲存變動" @@ -3615,17 +3733,19 @@ msgstr "儲存變動" msgid "State:" msgstr "陳述:" -#: perllib/FixMyStreet/Cobrand/Default.pm:645 +#: perllib/FixMyStreet/Cobrand/Default.pm:628 #: templates/web/base/admin/states/index.html:1 #, fuzzy msgid "States" msgstr "陳述" -#: perllib/FixMyStreet/Cobrand/Default.pm:639 +#: perllib/FixMyStreet/Cobrand/Default.pm:622 #: perllib/FixMyStreet/Cobrand/Zurich.pm:391 -#: templates/web/base/admin/index.html:71 templates/web/base/admin/stats.html:1 -#: templates/web/base/admin/stats_by_state.html:1 -#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:65 +#: 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:59 msgid "Stats" msgstr "統計" @@ -3635,7 +3755,7 @@ msgstr "統計" msgid "Status" msgstr "狀態" -#: templates/web/base/report/updates.html:10 +#: templates/web/base/report/updates.html:16 msgid "Still open, via questionnaire, %s" msgstr " %s問卷仍開放中" @@ -3648,7 +3768,12 @@ msgstr "街景圖" msgid "String" msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:192 +#: templates/web/base/report/new/category.html:35 +#, fuzzy +msgid "Subcategory" +msgstr "子類別：%s" + +#: perllib/FixMyStreet/Script/Reports.pm:191 msgid "Subcategory: %s" msgstr "子類別：%s" @@ -3665,18 +3790,19 @@ msgstr "主旨" msgid "Subject:" msgstr "主旨:" +#: templates/web/base/auth/smsform.html:27 #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/form_user_loggedin.html:63 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:36 +#: templates/web/base/report/new/form_user_loggedin.html:76 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:46 #: templates/web/base/report/new/form_user_loggedout_password.html:11 #: templates/web/zurich/report/new/fill_in_details_form.html:73 msgid "Submit" msgstr "送出" -#: templates/web/base/admin/report_edit.html:162 +#: templates/web/base/admin/report_edit.html:167 #: templates/web/base/admin/report_edit.html:24 -#: templates/web/base/admin/update_edit.html:77 -#: templates/web/base/admin/user-form.html:170 +#: templates/web/base/admin/update_edit.html:79 +#: templates/web/base/admin/user-form.html:188 #: templates/web/zurich/admin/report_edit-sdm.html:124 #: templates/web/zurich/admin/report_edit.html:264 #: templates/web/zurich/admin/update_edit.html:38 @@ -3718,7 +3844,7 @@ msgstr "" msgid "Summarise your changes" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:637 +#: perllib/FixMyStreet/Cobrand/Default.pm:620 #: perllib/FixMyStreet/Cobrand/Zurich.pm:387 #: templates/web/base/admin/bodies.html:29 #: templates/web/base/admin/index.html:1 templates/web/base/status/index.html:1 @@ -3726,25 +3852,31 @@ msgstr "" #: 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:49 +#: templates/web/zurich/header.html:43 msgid "Summary" msgstr "摘要" #: templates/web/zurich/reports/index.html:0 -#: templates/web/zurich/reports/index.html:4 +#: templates/web/zurich/reports/index.html:5 msgid "Summary reports" msgstr "申報摘要" -#: templates/web/base/admin/user-form.html:133 +#: templates/web/base/admin/stats/index.html:7 +#: templates/web/base/dashboard/index.html:21 +#, fuzzy +msgid "Summary statistics" +msgstr "申報摘要" + +#: templates/web/base/admin/user-form.html:151 msgid "Superuser:" msgstr "" -#: templates/web/base/admin/user-form.html:130 +#: templates/web/base/admin/user-form.html:148 msgid "Superusers have permission to perform all actions within the admin." msgstr "" -#: templates/web/base/admin/questionnaire.html:1 -#: templates/web/base/admin/stats.html:56 +#: templates/web/base/admin/stats/index.html:4 +#: templates/web/base/admin/stats/questionnaire.html:1 msgid "Survey Results" msgstr "調查結果" @@ -3752,14 +3884,14 @@ msgstr "調查結果" msgid "Template «%s»" msgstr "模版 «%s»" -#: perllib/FixMyStreet/Cobrand/Default.pm:661 +#: perllib/FixMyStreet/Cobrand/Default.pm:644 #: perllib/FixMyStreet/Cobrand/Zurich.pm:398 -#: templates/web/zurich/header.html:69 +#: templates/web/zurich/header.html:63 msgid "Templates" msgstr "模版" #: templates/web/base/admin/list_updates.html:12 -#: templates/web/base/admin/templates.html:11 +#: templates/web/zurich/admin/templates.html:9 msgid "Text" msgstr "內文" @@ -3767,7 +3899,7 @@ msgstr "內文" msgid "Text only version" msgstr "文字版" -#: templates/web/base/admin/template_edit.html:17 +#: templates/web/base/admin/template_edit.html:33 #: templates/web/base/admin/update_edit.html:20 #: templates/web/zurich/admin/template_edit.html:24 #: templates/web/zurich/admin/update_edit.html:12 @@ -3794,7 +3926,7 @@ msgstr "" msgid "Thank you for your feedback" msgstr "感謝您的回饋" -#: templates/web/base/around/_error_multiple.html:17 +#: templates/web/base/around/_error_multiple.html:18 msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above :" msgstr "感謝上傳照片，現在需要知道問題的地點位置，請在上方方格內輸入附近街名或郵編 " @@ -3810,7 +3942,7 @@ msgstr "照片上傳似乎無法正常 (%s), 請再試一次。 " msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "該地區似乎非該地方政府管轄，它可能在轄區外，請再試 一次 " -#: perllib/FixMyStreet/App/Controller/Location.pm:127 +#: perllib/FixMyStreet/App/Controller/Location.pm:141 msgid "That location does not appear to be in the UK; please try again." msgstr "這地點似乎不在台灣; 請再試 一次。" @@ -3820,11 +3952,11 @@ msgstr "這地點似乎不在台灣; 請再試 一次。" msgid "That postcode was not recognised, sorry." msgstr "抱歉此郵遞區號無法辨識" -#: perllib/FixMyStreet/App/Controller/Admin.pm:850 +#: perllib/FixMyStreet/App/Controller/Admin.pm:858 msgid "That problem has been marked as sent." msgstr "問題被標註為送出" -#: perllib/FixMyStreet/App/Controller/Admin.pm:843 +#: perllib/FixMyStreet/App/Controller/Admin.pm:851 msgid "That problem will now be resent." msgstr "此問題將重新送出" @@ -3862,8 +3994,8 @@ msgstr "" "此管轄區 功能只有在終端不只一個\n" "時才會用到。如果機關自行營運用終端，此處功能可以不選留白　" +#: templates/web/base/admin/body-form.html:101 #: templates/web/base/admin/body-form.html:102 -#: templates/web/base/admin/body-form.html:103 #: templates/web/base/admin/contact-form.html:104 #: templates/web/base/admin/contact-form.html:105 msgid "" @@ -3900,8 +4032,8 @@ msgstr "地方政府可能無法協助，除非您留下問題的詳細細節。 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." msgstr "這個勤奮表單顯示用戶的活動(誰做了做多的修改編輯活動)" -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:63 -#: perllib/FixMyStreet/App/Controller/Reports.pm:103 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:43 +#: perllib/FixMyStreet/App/Controller/Reports.pm:85 msgid "The error was: %s" msgstr "顯示錯誤為: %s" @@ -3943,7 +4075,7 @@ msgstr "用戶提供的本地最新已修復問題　" msgid "The latest problems within {{NAME}}'s boundary reported by users" msgstr "用戶申報{{NAME}}地區內地的最新問題" -#: templates/web/base/auth/token.html:9 +#: templates/web/base/auth/smsform.html:7 templates/web/base/auth/token.html:9 msgid "The link might have expired, or maybe you didn’t quite copy and paste it correctly." msgstr "這連結可能失效了或者你並未正確地複制貼上它" @@ -3968,7 +4100,7 @@ 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 "" -#: perllib/FixMyStreet/Script/Reports.pm:96 +#: perllib/FixMyStreet/Script/Reports.pm:95 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "用戶無法在地點上標示問題，但可以看到他們輸入的地點" @@ -3981,33 +4113,38 @@ msgstr "" "用戶的名字 會公開出現在未標記匿名的申報上\n" "名字不需要獨特可重覆　" -#: templates/web/base/around/on_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:17 #: templates/web/base/my/_problem-list.html:8 #: templates/web/base/reports/_problem-list.html:13 msgid "There are no reports to show." msgstr "沒有申報可顯示" -#: perllib/FixMyStreet/App/Controller/Reports.pm:100 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1140 +msgid "There is already an auto-response template for this category/state." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:82 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "本頁現在無法願現所要求的申報資料，請稍候再試。" #: perllib/FixMyStreet/App/Controller/Contact.pm:138 -#: perllib/FixMyStreet/App/Controller/Dashboard.pm:62 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:42 msgid "There was a problem showing this page. Please try again later." msgstr "本頁出現錯誤，請再試一次" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:785 -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:152 -#: templates/web/base/auth/general.html:55 -#: templates/web/zurich/auth/general.html:28 -msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form." -msgstr "您的電子郵件與密碼不相符，如果您遺忘密碼或尚未註冊，請在申請表單上填入電子郵件" - #: perllib/FixMyStreet/App/Controller/Alert.pm:359 msgid "There was a problem with your email/password combination. Please try again." msgstr "您的電子郵件/密碼不符，請重試一次" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:357 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:806 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:135 +#: templates/web/base/auth/general.html:51 +#: templates/web/zurich/auth/general.html:28 +#, fuzzy +msgid "There was a problem with your login information. If you cannot remember your password, or do not have one, please fill in the ‘No’ section of the form." +msgstr "您的電子郵件與密碼不相符，如果您遺忘密碼或尚未註冊，請在申請表單上填入電子郵件" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:338 msgid "There was a problem with your update. Please try again." msgstr "您的申報有問題，請重試一次" @@ -4015,7 +4152,7 @@ msgstr "您的申報有問題，請重試一次" msgid "There were problems with your report. Please see below." msgstr "您的申報有問題，請見下方說明" -#: perllib/FixMyStreet/App/Controller/Report/Update.pm:392 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:373 msgid "There were problems with your update. Please see below." msgstr "您的更新有問題，請見下方說明" @@ -4080,26 +4217,34 @@ msgstr "" "此單位只涵蓋 負責區域的申報問題處理。　\n" "除非其涵蓋至少一個區域，否則政府單位不會接收到問題申報　" -#: perllib/FixMyStreet/Script/Reports.pm:199 +#: perllib/FixMyStreet/Script/Reports.pm:198 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:202 +#: perllib/FixMyStreet/Script/Reports.pm:201 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:910 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:954 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:971 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1003 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1049 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:942 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:986 #: perllib/FixMyStreet/Cobrand/UK.pm:45 msgid "This information is required" msgstr "本項資訊必填" +#: templates/web/base/admin/template_edit.html:19 +msgid "This is a private name for this template so you can identify it when updating reports or editing in the admin." +msgstr "" + #: templates/web/base/debug_header.html:3 msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." msgstr "本站為開發試用，可能隨時故障，資料庫也會定期刪除。" +#: templates/web/base/admin/template_edit.html:29 +msgid "This is the public text that will be shown on the site." +msgstr "" + #: templates/web/base/report/new/form_report.html:58 msgid "This pothole has been here for two months and…" msgstr "" @@ -4116,7 +4261,7 @@ msgstr "問題尚未解決" msgid "This problem is still ongoing" msgstr "" -#: templates/web/base/report/duplicate-no-updates.html:3 +#: templates/web/base/report/duplicate-no-updates.html:5 msgid "This report is a duplicate. Please leave updates on the original report:" msgstr "" @@ -4126,23 +4271,23 @@ msgstr "" msgid "This report is awaiting moderation." msgstr "此問題尚待審核" -#: perllib/FixMyStreet/Script/Alerts.pm:98 +#: perllib/FixMyStreet/Script/Alerts.pm:119 msgid "This report is currently marked as closed." msgstr "該申報目前注記為結案狀態" -#: perllib/FixMyStreet/Script/Alerts.pm:96 +#: perllib/FixMyStreet/Script/Alerts.pm:117 msgid "This report is currently marked as fixed." msgstr "該申報目前注記為解決狀態" -#: perllib/FixMyStreet/Script/Alerts.pm:100 +#: perllib/FixMyStreet/Script/Alerts.pm:121 msgid "This report is currently marked as open." msgstr "該申報目前注記為開放狀態" -#: perllib/FixMyStreet/Script/Reports.pm:109 +#: perllib/FixMyStreet/Script/Reports.pm:108 msgid "This report was submitted anonymously" msgstr "此為匿名申報" -#: perllib/FixMyStreet/Script/Reports.pm:89 +#: perllib/FixMyStreet/Script/Reports.pm:88 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "本頁包括由用戶提供反應問題的照片　" @@ -4153,7 +4298,7 @@ msgstr "本頁包括由用戶提供反應問題的照片　" msgid "Time spent (in minutes):" msgstr "花費時間(以分鐘計):" -#: perllib/FixMyStreet/Cobrand/Default.pm:638 +#: perllib/FixMyStreet/Cobrand/Default.pm:621 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "時間軸" @@ -4165,20 +4310,21 @@ msgstr "" #: templates/web/base/admin/flagged.html:15 #: templates/web/base/admin/index.html:61 #: templates/web/base/admin/reports.html:13 -#: templates/web/base/admin/templates.html:10 +#: templates/web/base/admin/templates.html:6 +#: templates/web/zurich/admin/templates.html:8 msgid "Title" msgstr "標題" -#: templates/web/base/admin/template_edit.html:13 +#: templates/web/base/admin/template_edit.html:23 #: templates/web/zurich/admin/template_edit.html:20 msgid "Title:" msgstr "標題" -#: templates/web/base/alert/index.html:25 +#: templates/web/base/alert/index.html:26 msgid "To find out what local alerts we have for you, please enter your %s postcode or street name and area:" msgstr "找出適合您的在地通知，請輸入您的郵編或街名區域" -#: templates/web/base/alert/index.html:27 +#: templates/web/base/alert/index.html:28 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "找出適合您的在地通知，請輸入您的郵編或街名區域" @@ -4190,44 +4336,36 @@ msgstr "" msgid "To limit this collection of fields to a single language, select it here." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:95 +#: perllib/FixMyStreet/Script/Reports.pm:94 msgid "To view a map of the precise location of this issue" msgstr "檢視地圖上問題之確切位置" -#: templates/web/base/reports/index.html:97 -msgid "Top 5 most used categories" -msgstr "" - -#: templates/web/base/reports/index.html:83 -msgid "Top 5 responsive councils" +#: templates/web/base/auth/generate_token.html:11 +msgid "Token:" msgstr "" -#: templates/web/base/admin/questionnaire.html:24 -#: templates/web/base/admin/stats.html:24 -#: templates/web/base/admin/stats.html:43 -#: templates/web/base/admin/stats_fix_rate.html:4 -#: templates/web/zurich/admin/stats.html:30 -msgid "Total" -msgstr "總數" - -#: templates/web/base/dashboard/index.html:97 -msgid "Total marked" +#: templates/web/base/reports/index.html:126 +msgid "Top 5 most used categories" msgstr "" -#: templates/web/base/dashboard/index.html:71 -msgid "Total marked as fixed" +#: templates/web/base/reports/index.html:111 +msgid "Top 5 responsive councils" msgstr "" -#: templates/web/base/dashboard/index.html:125 -msgid "Total not marked" +#: templates/web/base/reports/index.html:98 +msgid "Top 5 wards" msgstr "" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:56 -msgid "Total reports received" -msgstr "" +#: templates/web/base/admin/stats/fix_rate.html:4 +#: templates/web/base/admin/stats/questionnaire.html:24 +#: templates/web/base/dashboard/index.html:114 +#: templates/web/base/dashboard/index.html:119 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/zurich/admin/stats/index.html:30 +msgid "Total" +msgstr "總數" -#: templates/web/base/report/_inspect.html:134 +#: templates/web/base/report/_inspect.html:140 #: templates/web/base/report/_item.html:104 msgid "Traffic management required?" msgstr "" @@ -4240,18 +4378,19 @@ msgstr "" msgid "Translations" msgstr "" -#: templates/web/base/admin/user-form.html:111 +#: templates/web/base/admin/user-form.html:129 msgid "Trusted by bodies:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:726 +#: perllib/FixMyStreet/Cobrand/Default.pm:709 msgid "Trusted to make reports that don't need to be inspected" msgstr "" -#: templates/web/base/admin/user-form.html:119 +#: templates/web/base/admin/user-form.html:137 msgid "Trusted:" msgstr "" +#: templates/web/base/auth/smsform.html:17 #: templates/web/base/js/translation_strings.html:29 msgid "Try again" msgstr "再試一次" @@ -4266,7 +4405,11 @@ msgstr "何不直接發信給我們:" msgid "Type" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/State.pm:59 +#: templates/web/base/admin/user-form.html:38 +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 @@ -4275,15 +4418,11 @@ msgstr "" msgid "Unconfirmed" msgstr "未確認的" -#: templates/web/base/reports/_list-filters.html:5 -msgid "Unfixed reports" -msgstr "未處理之申報　" - #: templates/web/base/report/banner.html:9 msgid "Unknown" msgstr "未知的" -#: perllib/FixMyStreet/App/Controller/Rss.pm:174 +#: perllib/FixMyStreet/App/Controller/Rss.pm:178 msgid "Unknown alert type" msgstr "未知的通知類別" @@ -4293,13 +4432,14 @@ msgstr "未知的通知類別" msgid "Unknown error" msgstr "未知的錯誤" +#: perllib/FixMyStreet/App/Controller/My.pm:200 #: perllib/FixMyStreet/App/Controller/Report.pm:112 #: perllib/FixMyStreet/App/Controller/Report.pm:118 #: perllib/FixMyStreet/App/Controller/Report.pm:121 msgid "Unknown problem ID" msgstr "未知的問題編號　　" -#: templates/web/base/reports/_list-filters.html:10 +#: templates/web/base/reports/_list-filters.html:18 msgid "Unshortlisted" msgstr "" @@ -4324,12 +4464,12 @@ msgstr "下方更新 為匿名提供%s" msgid "Update below added by %s at %s" msgstr "由%d 在 %s　所提供的更新" -#: templates/web/base/admin/body-form.html:140 -#: templates/web/zurich/admin/body-form.html:52 +#: templates/web/base/admin/body-form.html:139 +#: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "更新內文" -#: templates/web/base/admin/stats_by_state.html:21 +#: templates/web/base/admin/stats/state.html:21 msgid "Update breakdown by state" msgstr "陳述目前的故障　" @@ -4337,16 +4477,16 @@ msgstr "陳述目前的故障　" msgid "Update by {{name}}" msgstr "由{{name}}更新" -#: templates/web/base/admin/update_edit.html:44 +#: templates/web/base/admin/update_edit.html:46 #: templates/web/zurich/admin/update_edit.html:25 msgid "Update changed problem state to %s" msgstr "更新改變問題之陳述到%s　" -#: templates/web/base/admin/update_edit.html:46 +#: templates/web/base/admin/update_edit.html:48 msgid "Update marked problem as fixed" msgstr "本問題已解決之更新標註" -#: templates/web/base/admin/update_edit.html:48 +#: templates/web/base/admin/update_edit.html:50 msgid "Update reopened problem" msgstr "更新重申報之問題　" @@ -4360,20 +4500,20 @@ msgstr "更新之狀態" msgid "Updated" msgstr "已更新" -#: perllib/FixMyStreet/DB/Result/Comment.pm:249 +#: perllib/FixMyStreet/DB/Result/Comment.pm:260 #, fuzzy msgid "Updated by %s (%s) at %s" msgstr "由%s (%s) 在%s" -#: perllib/FixMyStreet/DB/Result/Comment.pm:251 +#: perllib/FixMyStreet/DB/Result/Comment.pm:262 #, fuzzy msgid "Updated by %s at %s" msgstr "由%s 在%s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1262 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1326 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1489 -#: perllib/FixMyStreet/App/Controller/Admin.pm:910 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1299 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1398 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1591 +#: perllib/FixMyStreet/App/Controller/Admin.pm:933 #: perllib/FixMyStreet/Cobrand/Zurich.pm:767 #: perllib/FixMyStreet/Cobrand/Zurich.pm:792 #: perllib/FixMyStreet/Cobrand/Zurich.pm:862 @@ -4381,7 +4521,7 @@ msgid "Updated!" msgstr "已更新！" #: templates/web/base/admin/list_updates.html:2 -#: templates/web/base/report/update.html:5 +#: templates/web/base/report/update.html:3 #: templates/web/zurich/report/updates.html:2 msgid "Updates" msgstr "更新" @@ -4428,40 +4568,81 @@ msgstr "已用過之地圖" msgid "User ID to attribute fetched comments to" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1745 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1755 +#, fuzzy +msgid "User added to abuse list" +msgstr "電子郵件列入濫發名單" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1473 +msgid "User already exists" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1752 +#, fuzzy +msgid "User already in abuse list" +msgstr "電子郵件己在濫發名單" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1834 msgid "User flag removed" msgstr "移除用戶的標記警告" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1777 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1805 msgid "User flagged" msgstr "給用戶標記警告" -#: templates/web/base/dashboard/index.html:54 -#: templates/web/base/dashboard/index.html:58 -msgid "User has marked as fixed" -msgstr "" +#: templates/web/base/admin/report_blocks.html:18 +#: templates/web/base/admin/user-form.html:38 +#: templates/web/base/admin/users.html:32 +#, fuzzy +msgid "User in abuse table" +msgstr "濫用表格？" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." msgstr "用戶找到相符的名稱與電子郵件" -#: perllib/FixMyStreet/Cobrand/Default.pm:669 -#: perllib/FixMyStreet/Cobrand/Default.pm:728 +#: templates/web/base/admin/report_edit.html:129 +#: templates/web/base/admin/update_edit.html:36 +#, fuzzy +msgid "User:" +msgstr "使用者" + +#: perllib/FixMyStreet/Cobrand/Default.pm:652 +#: perllib/FixMyStreet/Cobrand/Default.pm:711 #: perllib/FixMyStreet/Cobrand/Zurich.pm:403 -#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:61 +#: templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:55 msgid "Users" msgstr "使用者" -#: templates/web/base/admin/user-form.html:141 +#: templates/web/base/admin/user-form.html:159 msgid "Users can perform the following actions within their assigned body or area." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:381 -#: perllib/FixMyStreet/App/Controller/Admin.pm:417 -#: perllib/FixMyStreet/App/Controller/Admin.pm:439 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 msgid "Values updated" msgstr "數值更新" +#: templates/web/base/my/my.html:43 templates/web/base/my/my.html:55 +msgid "Verify" +msgstr "" + +#: templates/web/base/auth/change_email.html:1 +#: templates/web/base/auth/change_email.html:5 +#, fuzzy +msgid "Verify email address" +msgstr "您的電子郵件" + +#: templates/web/base/auth/change_phone.html:1 +#: templates/web/base/auth/change_phone.html:5 +#, fuzzy +msgid "Verify phone number" +msgstr "電話號碼" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/update_edit.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:23 @@ -4483,12 +4664,7 @@ msgstr "檢視地區" msgid "Viewing a problem" msgstr "檢視問題　" -#. ("Week to date") -#: templates/web/base/dashboard/index.html:48 -msgid "WTD" -msgstr "" - -#: templates/web/base/dashboard/index.html:20 +#: templates/web/base/dashboard/index.html:29 msgid "Ward:" msgstr "" @@ -4498,20 +4674,25 @@ msgstr "地方政府轄下的里/區" #: templates/web/base/alert/choose.html:6 #: templates/web/base/around/_error_multiple.html:6 -msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here." -msgstr "本區域我們找到更多符合的資料，我們最多顯示十筆資料。如果你無法在其中找到所要的資訊，請嘗試其它搜尋方式。" +#, fuzzy +msgid "We found more than one match for that location." +msgstr "抱歉，我們無法找到此位置" -#: templates/web/base/around/lookup_by_ref.html:5 +#: templates/web/base/around/lookup_by_ref.html:6 msgid "We found more than one match for that problem reference:" msgstr "" +#: templates/web/base/auth/smsform.html:20 +msgid "We have sent a confirmation code to your phone. Please enter it below:" +msgstr "" + #: templates/web/base/auth/general.html:8 #: templates/web/base/report/display.html:35 #: templates/web/base/report/new/oauth_email_form.html:5 msgid "We need your email address, please give it below." msgstr "" -#: perllib/FixMyStreet/Script/Reports.pm:208 +#: perllib/FixMyStreet/Script/Reports.pm:207 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之責任，然而目前我們並無他們的聯絡資訊。如果您知道適當的聯絡人資訊，請告訴我們。" @@ -4519,6 +4700,12 @@ msgstr "我們理解此問題可能是%s之責任，然而目前我們並無他 msgid "We send it to the council on your behalf" msgstr "我們將代表您將此呈報給地方政府" +#: templates/web/base/alert/choose.html:12 +#: templates/web/base/around/_error_multiple.html:12 +#, fuzzy +msgid "We show up to ten matches, please try a different search if yours is not here." +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." @@ -4528,8 +4715,8 @@ msgstr "您的個人資料，將會依照本站隱私權政 msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" msgstr "很遺憾該問題仍未修復。何不試試聯絡當地議員民代反應此狀況？" -#: templates/web/base/dashboard/index.html:48 -msgid "Week To Date" +#: templates/web/base/dashboard/index.html:117 +msgid "Website" msgstr "" #: templates/web/base/contact/submit.html:7 @@ -4557,7 +4744,7 @@ msgstr "" msgid "Which problems do you want alerts about?" msgstr "" -#: templates/web/base/report/_inspect.html:99 +#: templates/web/base/report/_inspect.html:105 msgid "Which report is it a duplicate of?" msgstr "" @@ -4580,6 +4767,10 @@ msgstr "願望" msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by MaPit." msgstr "搜尋要求，也可能限制單一機構中搜尋相關權責單位。其搜尋字眼為 MaPit提供的主管ID." +#: templates/web/base/dashboard/index.html:158 +msgid "Within the specified timeframe:" +msgstr "" + #: templates/web/base/front/footer-marketing.html:3 msgid "Would you like to contribute to FixMyStreet? Our code is open source and available at fixmystreet.org." msgstr "您願為FixMyStreet貢獻嗎?這個一個開放原始碼，可從 fixmystreet.org官網進一步了解　" @@ -4596,16 +4787,7 @@ msgstr "請注意留言內容，勿用注音文並應加上標點符號以利閱 msgid "Wrong location? Just click again on the map." msgstr "錯誤的地? 請再次點擊此地圖" -#. ("Year to date") -#: templates/web/base/dashboard/index.html:51 -msgid "YTD" -msgstr "" - -#: templates/web/base/admin/stats.html:10 -msgid "Year" -msgstr "年份" - -#: perllib/FixMyStreet/Cobrand/Default.pm:1236 +#: perllib/FixMyStreet/Cobrand/Default.pm:1221 #: templates/web/base/admin/bodies.html:70 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 @@ -4620,7 +4802,7 @@ msgstr "年份" #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:104 #: templates/web/base/questionnaire/index.html:53 -#: templates/web/base/report/_inspect.html:90 +#: templates/web/base/report/_inspect.html:96 msgid "Yes" msgstr "是" @@ -4633,7 +4815,7 @@ msgstr "我有密碼" msgid "You are complaining that this problem report was unnecessarily moderated:" msgstr "你申訴此問題遭不必要之和諧　" -#: templates/web/base/js/translation_strings.html:73 +#: templates/web/base/js/translation_strings.html:77 msgid "You are offline" msgstr "" @@ -4650,7 +4832,7 @@ msgstr "您檢舉下列問題之更為濫用，包括個人資料或相似" msgid "You can view the problem on this site." msgstr "您可在本站上檢視問題." -#: templates/web/base/admin/user-form.html:96 +#: templates/web/base/admin/user-form.html:114 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "您可以新增某位用戶到濫用者名單，它會自動隱藏(不會送出)該名用戶所提交的申報　" @@ -4679,7 +4861,7 @@ 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:93 +#: templates/web/base/admin/body-form.html:92 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "您可以刪除某一單位如果不想讓它在本站激活" @@ -4687,7 +4869,7 @@ msgstr "您可以刪除某一單位如果不想讓它在本站激活" msgid "You declined; please fill in the box above" msgstr "您受到拒絕，請填寫上方表格。" -#: templates/web/base/js/translation_strings.html:75 +#: templates/web/base/js/translation_strings.html:79 msgid "You have %s saved to submit." msgstr "" @@ -4714,18 +4896,38 @@ msgstr "您己登出" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "您在地圖上用綠色標註問題之地點。如果此不是正確地點，請再次點擊原地圖。" -#: templates/web/base/auth/change_email.html:6 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:125 +#, fuzzy +msgid "You have successfully added your phone number." +msgstr "您已成功地確認電子郵件" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:141 #: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "您已成功地確認電子郵件" +#: templates/web/base/auth/change_phone.html:15 +#, fuzzy +msgid "You have successfully confirmed your phone number." +msgstr "您已成功地確認電子郵件" + +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:112 +#, fuzzy +msgid "You have successfully removed your phone number." +msgstr "您已成功地確認電子郵件" + #: templates/web/base/report/display.html:25 #: templates/web/base/report/new/login_success_form.html:3 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "您已成功登入，請檢查您的個人資訊是否正確:" -#: templates/web/base/my/my.html:31 +#: perllib/FixMyStreet/App/Controller/Auth/Profile.pm:147 +#, fuzzy +msgid "You have successfully verified your phone number." +msgstr "您已成功地確認電子郵件" + +#: templates/web/base/my/my.html:73 msgid "You haven’t created any reports yet. Report a problem now." msgstr "您當未創建任何申報，立即提供申報" @@ -4752,36 +4954,43 @@ msgid "Your Reports" msgstr "您的申報　" #: templates/web/base/auth/change_password.html:11 +#: templates/web/base/auth/generate_token.html:15 #: templates/web/base/main_nav_items.html:4 templates/web/base/my/my.html:18 msgid "Your account" msgstr "" #: templates/web/base/alert/updates.html:19 #: templates/web/base/alert/updates.html:22 +#: templates/web/base/auth/general.html:44 #: templates/web/base/contact/index.html:80 #: templates/web/base/report/display_tools.html:46 #: templates/web/base/report/display_tools.html:49 -#: templates/web/base/report/new/form_user_loggedout_email.html:1 -#: templates/web/base/report/update/form_user_loggedout_email.html:1 +#: templates/web/base/report/new/form_user_loggedout_email.html:6 +#: templates/web/base/report/update/form_user_loggedout_email.html:6 #: templates/web/zurich/report/new/fill_in_details_form.html:53 msgid "Your email" msgstr "您的電子郵件" -#: templates/web/base/auth/change_email.html:9 -#: templates/web/base/auth/general.html:57 -#: templates/web/base/report/update/form_user_loggedout_email.html:5 +#: templates/web/base/auth/change_email.html:15 #: templates/web/zurich/auth/general.html:30 #: templates/web/zurich/auth/general.html:58 msgid "Your email address" msgstr "您的電子郵件" +#: templates/web/base/auth/general.html:42 +#: templates/web/base/report/new/form_user_loggedout_email.html:2 +#: templates/web/base/report/update/form_user_loggedout_email.html:2 +#, fuzzy +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 "您的個人資料，將會依照本站隱私權政策作處理使用" -#: templates/web/base/auth/general.html:109 +#: templates/web/base/auth/general.html:114 #: templates/web/base/contact/index.html:74 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:17 +#: templates/web/base/report/new/form_user_loggedout_by_email.html:21 #: templates/web/base/report/update/form_name.html:33 #: templates/web/zurich/auth/general.html:61 #: templates/web/zurich/report/new/fill_in_details_form.html:63 @@ -4792,19 +5001,19 @@ msgstr "姓名" msgid "Your name has already been sent to %s, but we can hide it on this page:" msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:264 +#: perllib/FixMyStreet/App/Controller/My.pm:272 msgid "Your name has been hidden from all your reports and updates." msgstr "" -#: perllib/FixMyStreet/App/Controller/My.pm:260 +#: perllib/FixMyStreet/App/Controller/My.pm:268 msgid "Your name has been hidden." msgstr "" -#: templates/web/base/js/translation_strings.html:65 +#: templates/web/base/js/translation_strings.html:69 msgid "Your offline reports" msgstr "" -#: templates/web/base/auth/general.html:87 +#: templates/web/base/auth/general.html:84 #: templates/web/base/report/new/form_user_loggedout_password.html:10 #: templates/web/base/report/update/form_user_loggedout_password.html:9 #: templates/web/zurich/auth/general.html:34 @@ -4815,8 +5024,8 @@ msgstr "密碼" msgid "Your password has been changed" msgstr "密碼已更新" +#: templates/web/base/auth/change_phone.html:19 #: templates/web/base/contact/index.html:87 -#: templates/web/base/report/new/form_user_loggedout_by_email.html:26 #: templates/web/zurich/report/new/fill_in_details_form.html:69 msgid "Your phone number" msgstr "電話號碼" @@ -4825,7 +5034,7 @@ msgstr "電話號碼" msgid "Your report" msgstr "" -#: templates/web/base/my/my.html:28 +#: templates/web/base/my/my.html:70 msgid "Your reports" msgstr "你作的申報" @@ -4834,25 +5043,40 @@ msgstr "你作的申報" msgid "Your shortlist" msgstr "" -#: templates/web/base/js/translation_strings.html:66 +#: templates/web/base/auth/generate_token.html:8 +#, fuzzy +msgid "Your token has been generated" +msgstr "密碼已更新" + +#: templates/web/base/js/translation_strings.html:70 msgid "Your update has been saved offline for submission when back online." msgstr "" -#: templates/web/base/my/my.html:51 +#: templates/web/base/my/my.html:93 msgid "Your updates" msgstr "更新" +#: perllib/FixMyStreet/SMS.pm:46 +msgid "Your verification code is %s" +msgstr "" + #: templates/web/base/report/new/form_user_loggedin.html:19 #: templates/web/base/report/update/form_name.html:12 msgid "Yourself" msgstr "" #: templates/web/base/admin/category-checkboxes.html:7 -#: templates/web/base/admin/user-form.html:151 +#: templates/web/base/admin/user-form.html:169 msgid "all" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:259 +#: perllib/FixMyStreet/App/Controller/Admin.pm:909 +#: perllib/FixMyStreet/App/Controller/Moderate.pm:85 +#: perllib/FixMyStreet/DB/Result/Comment.pm:236 +msgid "an administrator" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:270 msgid "and a defect raised" msgstr "" @@ -4869,8 +5093,8 @@ msgstr "地方政府" msgid "didn't use map" msgstr "不使用地圖" -#: templates/web/base/alert/index.html:33 -#: templates/web/base/around/postcode_form.html:12 +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:14 msgid "e.g. ‘%s’ or ‘%s’" msgstr "例如 ‘%s’ 或 ‘%s’" @@ -4893,23 +5117,24 @@ msgstr "%s上回更新:" msgid "less than a minute" msgstr "少於一分鐘" -#: perllib/FixMyStreet/App/Controller/Admin.pm:119 -#: templates/web/base/admin/questionnaire.html:15 -#: templates/web/base/admin/questionnaire.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:120 +#: templates/web/base/admin/stats/questionnaire.html:15 +#: templates/web/base/admin/stats/questionnaire.html:16 msgid "n/a" msgstr "不適用" #: templates/web/base/admin/category-checkboxes.html:8 -#: templates/web/base/admin/user-form.html:152 +#: templates/web/base/admin/user-form.html:170 msgid "none" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:278 +#: perllib/FixMyStreet/DB/ResultSet/State.pm:77 #, fuzzy msgid "not the council's responsibility" msgstr "標註為非本區政府職責範圍" -#: templates/web/base/js/translation_strings.html:27 +#: templates/web/base/alert/index.html:38 +#: templates/web/base/around/postcode_form.html:26 msgid "or locate me automatically" msgstr "自動辨識我所在位置 " @@ -4950,7 +5175,7 @@ msgstr "地圖上無標記，用戶未使用地圖" msgid "this location" msgstr "檢視地區" -#: perllib/FixMyStreet/Script/Reports.pm:184 +#: perllib/FixMyStreet/Script/Reports.pm:183 msgid "this type of local problem" msgstr "此類在地問題" @@ -4958,11 +5183,11 @@ msgstr "此類在地問題" msgid "today" msgstr "今天" -#: templates/web/base/js/translation_strings.html:76 +#: templates/web/base/js/translation_strings.html:80 msgid "update" msgstr "" -#: templates/web/base/js/translation_strings.html:77 +#: templates/web/base/js/translation_strings.html:81 msgid "updates" msgstr "" @@ -4970,14 +5195,24 @@ msgstr "" msgid "used map" msgstr "已用過之地圖" -#: templates/web/base/admin/update_edit.html:37 +#: templates/web/base/admin/update_edit.html:39 msgid "user is from same council as problem - %d" msgstr "用戶來同一問題的地方政府- %d" -#: templates/web/base/admin/update_edit.html:40 +#: templates/web/base/admin/update_edit.html:42 msgid "user is problem owner" msgstr "%d 天數" +#: perllib/FixMyStreet/App/Controller/Admin.pm:1778 +#, fuzzy +msgid "user not in abuse list" +msgstr "電子郵件己在濫發名單" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1776 +#, fuzzy +msgid "user removed from abuse list" +msgstr "電子郵件列入濫發名單" + #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:3 msgid "ward" @@ -5031,31 +5266,31 @@ msgid "%d year" msgid_plural "%d years" msgstr[0] "" -#: templates/web/base/reports/index.html:92 +#: templates/web/fixmystreet.com/reports/summary.html:103 #, perl-format msgid "%s day" msgid_plural "%s days" msgstr[0] "" -#: templates/web/base/reports/index.html:55 +#: templates/web/base/reports/index.html:57 #, perl-format msgid "%s problem marked as fixed" msgid_plural "%s problems marked as fixed" msgstr[0] "" -#: templates/web/base/reports/index.html:43 +#: templates/web/base/reports/index.html:45 #, perl-format msgid "%s problem reported" msgid_plural "%s problems reported" msgstr[0] "" -#: templates/web/base/reports/index.html:107 +#: templates/web/fixmystreet.com/reports/summary.html:119 #, perl-format msgid "%s report" msgid_plural "%s reports" msgstr[0] "" -#: templates/web/base/reports/index.html:49 +#: templates/web/base/reports/index.html:51 #, perl-format msgid "%s update on problems" msgid_plural "%s updates on problems" @@ -5115,6 +5350,45 @@ msgid "report" msgid_plural "reports" msgstr[0] "" +#~ msgid "(Email in abuse table)" +#~ msgstr "電郵為濫發信件" + +#~ msgid "By Date" +#~ msgstr "日期" + +#~ msgid "Click here or enter as dd/mm/yyyy" +#~ msgstr "點選此處或輸入日期/月份/年份" + +#~ msgid "Confirmed reports between %s and %s" +#~ msgstr "%s 與 %s 之間已確認的申報" + +#~ msgid "Hide old" +#~ msgstr "隱藏舊文" + +#~ msgid "Include unconfirmed reports" +#~ msgstr "包括未確認的申報 " + +#~ msgid "Invalid end date" +#~ msgstr "無效的結束日期" + +#~ msgid "Invalid start date" +#~ msgstr "無效的開始日期" + +#~ msgid "No council" +#~ msgstr "無地方政府" + +#~ msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +#~ msgstr "請注意這裏包括了本月份總結撰寫前，尚未確認的申報，所以數目可能稍有降低。" + +#~ msgid "Show old" +#~ msgstr "顯示舊文" + +#~ msgid "Unfixed reports" +#~ msgstr "未處理之申報　" + +#~ msgid "Year" +#~ msgstr "年份" + #~ msgid "" #~ "%s sends different categories of problem\n" #~ "to the appropriate council, so problems within the boundary of a particular council\n" @@ -5171,9 +5445,6 @@ msgstr[0] "" #~ msgid "No further action" #~ msgstr "無法修復" -#~ msgid "Not Responsible" -#~ msgstr "無責任歸屬" - #~ msgid "Or problems reported to:" #~ msgstr "或將此問題 申報給:" diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index 7b9bd6e96c9..a5c29fce3f2 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -906,7 +906,7 @@ sub report_edit : Path('report_edit') : Args(1) { if ( $problem->state ne $old_state ) { $c->forward( 'log_edit', [ $id, 'problem', 'state_change' ] ); - my $name = _('an adminstrator'); + my $name = _('an administrator'); my $extra = { is_superuser => 1 }; if ($c->user->from_body) { $name = $c->user->from_body->name; diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index 1795579768c..398ce8ea6cc 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -638,7 +638,7 @@ foreach my $test ( } else { ok !$comment->get_extra_metadata('is_body_user'), 'body user metadata not set'; ok $comment->get_extra_metadata('is_superuser'), 'superuser metadata set'; - is $comment->name, _('an adminstrator'), 'comment name is admin'; + is $comment->name, _('an administrator'), 'comment name is admin'; } } else { is $report->comments->count, 0, 'report has no comments'; diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index 7029365ff5b..aefe77e47b5 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -981,7 +981,7 @@ for my $test( }, { user => $user2, - name => 'an adminstrator', + name => 'an administrator', superuser => 1, desc =>"check first comment from super user with status change but no text is displayed" } diff --git a/templates/web/base/alert/choose.html b/templates/web/base/alert/choose.html index 312b9f520fe..50835e90c06 100644 --- a/templates/web/base/alert/choose.html +++ b/templates/web/base/alert/choose.html @@ -3,12 +3,13 @@

[% loc('Local RSS feeds and email alerts') %]

[% IF possible_location_matches %] -

[% loc('We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here.') %]

-
    +

    [% loc('We found more than one match for that location.') %]

    + +

    [% loc('We show up to ten matches, please try a different search if yours is not here.') %]

    [% END %] [% INCLUDE 'footer.html' %]